From 86d99d8ca519d1997e8067fc45743d09d1fbbcd9 Mon Sep 17 00:00:00 2001
From: TimQu <tim.quatmann@cs.rwth-aachen.de>
Date: Thu, 27 Sep 2018 13:55:57 +0200
Subject: [PATCH 1/2] silenced a few warnings
---
src/storm/generator/TransientVariableInformation.h | 2 +-
src/storm/generator/VariableInformation.h | 2 +-
src/storm/storage/jani/Model.h | 2 +-
.../jani/expressions/JaniExpressionSubstitutionVisitor.cpp | 1 -
.../jani/expressions/JaniExpressionSubstitutionVisitor.h | 1 +
5 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/storm/generator/TransientVariableInformation.h b/src/storm/generator/TransientVariableInformation.h
index 8f221c734..c6047f470 100644
--- a/src/storm/generator/TransientVariableInformation.h
+++ b/src/storm/generator/TransientVariableInformation.h
@@ -16,7 +16,7 @@ namespace storm {
namespace jani {
class Model;
class Automaton;
- class ArrayEliminatorData;
+ struct ArrayEliminatorData;
class VariableSet;
}
diff --git a/src/storm/generator/VariableInformation.h b/src/storm/generator/VariableInformation.h
index 0326e8d0c..4f6b99ec5 100644
--- a/src/storm/generator/VariableInformation.h
+++ b/src/storm/generator/VariableInformation.h
@@ -16,7 +16,7 @@ namespace storm {
namespace jani {
class Model;
class Automaton;
- class ArrayEliminatorData;
+ struct ArrayEliminatorData;
class VariableSet;
}
diff --git a/src/storm/storage/jani/Model.h b/src/storm/storage/jani/Model.h
index c0740a80c..401d1a54a 100644
--- a/src/storm/storage/jani/Model.h
+++ b/src/storm/storage/jani/Model.h
@@ -35,7 +35,7 @@ namespace storm {
class Automaton;
class Exporter;
class SynchronizationVector;
- class ArrayEliminatorData;
+ struct ArrayEliminatorData;
class Property;
class Model {
diff --git a/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.cpp b/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.cpp
index e355c4113..168ea960b 100644
--- a/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.cpp
+++ b/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.cpp
@@ -13,7 +13,6 @@ namespace storm {
return storm::expressions::JaniExpressionSubstitutionVisitor<std::unordered_map<storm::expressions::Variable, storm::expressions::Expression>>(identifierToExpressionMap).substitute(expression);
}
}
-
namespace expressions {
diff --git a/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.h b/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.h
index 07867be28..6ae1c80fa 100644
--- a/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.h
+++ b/src/storm/storage/jani/expressions/JaniExpressionSubstitutionVisitor.h
@@ -21,6 +21,7 @@ namespace storm {
* @param variableToExpressionMapping A mapping from variables to expressions.
*/
JaniExpressionSubstitutionVisitor(MapType const& variableToExpressionMapping);
+ using SubstitutionVisitor<MapType>::visit;
virtual boost::any visit(ValueArrayExpression const& expression, boost::any const& data) override;
virtual boost::any visit(ConstructorArrayExpression const& expression, boost::any const& data) override;
From 4dc234d635d2b3ee460c11c6ec4fabc1f821878a Mon Sep 17 00:00:00 2001
From: TimQu <tim.quatmann@cs.rwth-aachen.de>
Date: Thu, 27 Sep 2018 14:24:09 +0200
Subject: [PATCH 2/2] silenced several 'unused parameter'-warnings
---
.../solver/EigenLinearEquationSolver.cpp | 4 ++--
src/storm/solver/LinearEquationSolver.cpp | 2 +-
src/storm/solver/StandardGameSolver.cpp | 2 +-
.../CheckIfThenElseGuardVisitor.cpp | 8 ++++----
.../SubsetEnumerator.cpp | 2 +-
src/storm/storage/jani/ArrayEliminator.cpp | 20 +++++++++----------
src/storm/storage/jani/FunctionEliminator.cpp | 6 +++---
.../jani/traverser/ArrayExpressionFinder.cpp | 14 ++++++-------
.../storage/jani/traverser/JaniTraverser.cpp | 8 ++++----
src/storm/transformer/GoalStateMerger.cpp | 2 +-
src/storm/utility/ConstantsComparator.cpp | 4 ++--
src/storm/utility/DirectEncodingExporter.cpp | 2 +-
src/storm/utility/VectorHelper.cpp | 2 +-
src/storm/utility/constants.cpp | 2 +-
14 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/src/storm/solver/EigenLinearEquationSolver.cpp b/src/storm/solver/EigenLinearEquationSolver.cpp
index 55046a495..6c96715cf 100644
--- a/src/storm/solver/EigenLinearEquationSolver.cpp
+++ b/src/storm/solver/EigenLinearEquationSolver.cpp
@@ -244,7 +244,7 @@ namespace storm {
}
template<typename ValueType>
- LinearEquationSolverProblemFormat EigenLinearEquationSolver<ValueType>::getEquationProblemFormat(Environment const& env) const {
+ LinearEquationSolverProblemFormat EigenLinearEquationSolver<ValueType>::getEquationProblemFormat(Environment const&) const {
return LinearEquationSolverProblemFormat::EquationSystem;
}
@@ -259,7 +259,7 @@ namespace storm {
}
template<typename ValueType>
- std::unique_ptr<storm::solver::LinearEquationSolver<ValueType>> EigenLinearEquationSolverFactory<ValueType>::create(Environment const& env) const {
+ std::unique_ptr<storm::solver::LinearEquationSolver<ValueType>> EigenLinearEquationSolverFactory<ValueType>::create(Environment const&) const {
return std::make_unique<storm::solver::EigenLinearEquationSolver<ValueType>>();
}
diff --git a/src/storm/solver/LinearEquationSolver.cpp b/src/storm/solver/LinearEquationSolver.cpp
index 14cda16bc..8207efcff 100644
--- a/src/storm/solver/LinearEquationSolver.cpp
+++ b/src/storm/solver/LinearEquationSolver.cpp
@@ -31,7 +31,7 @@ namespace storm {
}
template<typename ValueType>
- LinearEquationSolverRequirements LinearEquationSolver<ValueType>::getRequirements(Environment const& env) const {
+ LinearEquationSolverRequirements LinearEquationSolver<ValueType>::getRequirements(Environment const&) const {
return LinearEquationSolverRequirements();
}
diff --git a/src/storm/solver/StandardGameSolver.cpp b/src/storm/solver/StandardGameSolver.cpp
index f0ef60564..837a149b3 100644
--- a/src/storm/solver/StandardGameSolver.cpp
+++ b/src/storm/solver/StandardGameSolver.cpp
@@ -498,7 +498,7 @@ namespace storm {
}
template<typename ValueType>
- void StandardGameSolver<ValueType>::getInducedMatrixVector(std::vector<ValueType>& x, std::vector<ValueType> const& b, std::vector<uint_fast64_t> const& player1Choices, std::vector<uint_fast64_t> const& player2Choices, storm::storage::SparseMatrix<ValueType>& inducedMatrix, std::vector<ValueType>& inducedVector) const {
+ void StandardGameSolver<ValueType>::getInducedMatrixVector(std::vector<ValueType>&, std::vector<ValueType> const& b, std::vector<uint_fast64_t> const& player1Choices, std::vector<uint_fast64_t> const& player2Choices, storm::storage::SparseMatrix<ValueType>& inducedMatrix, std::vector<ValueType>& inducedVector) const {
// Get the rows of the player 2 matrix that are selected by the schedulers.
// Note that rows can be selected more than once and in an arbitrary order.
std::vector<storm::storage::sparse::state_type> selectedRows;
diff --git a/src/storm/storage/expressions/CheckIfThenElseGuardVisitor.cpp b/src/storm/storage/expressions/CheckIfThenElseGuardVisitor.cpp
index 0bbb32fba..49a1e658c 100644
--- a/src/storm/storage/expressions/CheckIfThenElseGuardVisitor.cpp
+++ b/src/storm/storage/expressions/CheckIfThenElseGuardVisitor.cpp
@@ -43,7 +43,7 @@ namespace storm {
boost::any_cast<bool>(expression.getSecondOperand()->accept(*this, data));
}
- boost::any CheckIfThenElseGuardVisitor::visit(VariableExpression const& expression, boost::any const&) {
+ boost::any CheckIfThenElseGuardVisitor::visit(VariableExpression const&, boost::any const&) {
return false;
}
@@ -55,15 +55,15 @@ namespace storm {
return expression.getOperand()->accept(*this, data);
}
- boost::any CheckIfThenElseGuardVisitor::visit(BooleanLiteralExpression const& expression, boost::any const&) {
+ boost::any CheckIfThenElseGuardVisitor::visit(BooleanLiteralExpression const&, boost::any const&) {
return false;
}
- boost::any CheckIfThenElseGuardVisitor::visit(IntegerLiteralExpression const& expression, boost::any const&) {
+ boost::any CheckIfThenElseGuardVisitor::visit(IntegerLiteralExpression const&, boost::any const&) {
return false;
}
- boost::any CheckIfThenElseGuardVisitor::visit(RationalLiteralExpression const& expression, boost::any const&) {
+ boost::any CheckIfThenElseGuardVisitor::visit(RationalLiteralExpression const&, boost::any const&) {
return false;
}
diff --git a/src/storm/storage/geometry/nativepolytopeconversion/SubsetEnumerator.cpp b/src/storm/storage/geometry/nativepolytopeconversion/SubsetEnumerator.cpp
index c6103bf9d..2de1b1c45 100644
--- a/src/storm/storage/geometry/nativepolytopeconversion/SubsetEnumerator.cpp
+++ b/src/storm/storage/geometry/nativepolytopeconversion/SubsetEnumerator.cpp
@@ -84,7 +84,7 @@ namespace storm {
}
template< typename DataType>
- bool SubsetEnumerator<DataType>::trueFilter(std::vector<uint_fast64_t> const& subset, uint_fast64_t const& item, DataType const& data){
+ bool SubsetEnumerator<DataType>::trueFilter(std::vector<uint_fast64_t> const&, uint_fast64_t const&, DataType const&) {
return true;
}
diff --git a/src/storm/storage/jani/ArrayEliminator.cpp b/src/storm/storage/jani/ArrayEliminator.cpp
index 9bedb334a..244eaa0b5 100644
--- a/src/storm/storage/jani/ArrayEliminator.cpp
+++ b/src/storm/storage/jani/ArrayEliminator.cpp
@@ -76,24 +76,24 @@ namespace storm {
return boost::any_cast<std::size_t>(expression.getOperand()->accept(*this, data));
}
- virtual boost::any visit(storm::expressions::BooleanLiteralExpression const& expression, boost::any const& data) override {
+ virtual boost::any visit(storm::expressions::BooleanLiteralExpression const&, boost::any const&) override {
return 0;
}
- virtual boost::any visit(storm::expressions::IntegerLiteralExpression const& expression, boost::any const& data) override {
+ virtual boost::any visit(storm::expressions::IntegerLiteralExpression const&, boost::any const&) override {
return 0;
}
- virtual boost::any visit(storm::expressions::RationalLiteralExpression const& expression, boost::any const& data) override {
+ virtual boost::any visit(storm::expressions::RationalLiteralExpression const&, boost::any const&) override {
return 0;
}
- virtual boost::any visit(storm::expressions::ValueArrayExpression const& expression, boost::any const& data) override {
+ virtual boost::any visit(storm::expressions::ValueArrayExpression const& expression, boost::any const&) override {
STORM_LOG_ASSERT(expression.size()->isIntegerLiteralExpression(), "unexpected kind of size expression of ValueArrayExpression (" << expression.size()->toExpression() << ").");
return static_cast<std::size_t>(expression.size()->evaluateAsInt());
}
- virtual boost::any visit(storm::expressions::ConstructorArrayExpression const& expression, boost::any const& data) override {
+ virtual boost::any visit(storm::expressions::ConstructorArrayExpression const& expression, boost::any const&) override {
if (!expression.size()->containsVariables()) {
return static_cast<std::size_t>(expression.size()->evaluateAsInt());
} else {
@@ -114,12 +114,12 @@ namespace storm {
}
}
- virtual boost::any visit(storm::expressions::ArrayAccessExpression const& expression, boost::any const& data) override {
+ virtual boost::any visit(storm::expressions::ArrayAccessExpression const&, boost::any const&) override {
STORM_LOG_WARN("Found Array access expression within an array expression. This is not expected since nested arrays are currently not supported.");
return 0;
}
- virtual boost::any visit(storm::expressions::FunctionCallExpression const& expression, boost::any const& data) override {
+ virtual boost::any visit(storm::expressions::FunctionCallExpression const&, boost::any const&) override {
STORM_LOG_THROW(false, storm::exceptions::UnexpectedException, "Found Function call expression within an array expression. This is not expected since functions are expected to be eliminated at this point.");
return 0;
}
@@ -328,7 +328,7 @@ namespace storm {
return ResultType(boost::any_cast<ResultType>(expression.at(index)->accept(*this, boost::any())));
}
- virtual boost::any visit(storm::expressions::ArrayAccessExpression const& expression, boost::any const& data) override {
+ virtual boost::any visit(storm::expressions::ArrayAccessExpression const& expression, boost::any const&) override {
if (expression.getSecondOperand()->containsVariables()) {
//get the size of the array expression
uint64_t size = MaxArraySizeExpressionVisitor().getMaxSize(expression.getFirstOperand()->toExpression(), arraySizes);
@@ -349,7 +349,7 @@ namespace storm {
}
}
- virtual boost::any visit(storm::expressions::FunctionCallExpression const& expression, boost::any const& data) override {
+ virtual boost::any visit(storm::expressions::FunctionCallExpression const&, boost::any const&) override {
STORM_LOG_THROW(false, storm::exceptions::UnexpectedException, "Found Function call expression while eliminating array expressions. This is not expected since functions are expected to be eliminated at this point.");
return false;
}
@@ -497,7 +497,7 @@ namespace storm {
}
}
- void traverse(EdgeDestination& edgeDestination, boost::any const& data) override {
+ void traverse(EdgeDestination& edgeDestination, boost::any const&) override {
edgeDestination.setProbability(arrayExprEliminator->eliminate(edgeDestination.getProbability()));
}
diff --git a/src/storm/storage/jani/FunctionEliminator.cpp b/src/storm/storage/jani/FunctionEliminator.cpp
index fcdaa0b34..32a9895de 100644
--- a/src/storm/storage/jani/FunctionEliminator.cpp
+++ b/src/storm/storage/jani/FunctionEliminator.cpp
@@ -91,7 +91,7 @@ namespace storm {
}
}
- virtual boost::any visit(storm::expressions::VariableExpression const& expression, boost::any const& data) override {
+ virtual boost::any visit(storm::expressions::VariableExpression const& expression, boost::any const&) override {
return expression.getSharedPointer();
}
@@ -267,7 +267,7 @@ namespace storm {
}
}
- virtual void traverse(Model& model, boost::any const& data) override {
+ virtual void traverse(Model& model, boost::any const&) override {
// First we need to apply functions called in function bodies
FunctionEliminationExpressionVisitor globalFunctionEliminationVisitor(&model.getGlobalFunctionDefinitions());
@@ -392,7 +392,7 @@ namespace storm {
}
}
- void traverse(storm::expressions::Expression const& expression, boost::any const& data) override {
+ void traverse(storm::expressions::Expression const& expression, boost::any const&) override {
STORM_LOG_THROW(getOccurringFunctionCalls(expression).empty(), storm::exceptions::UnexpectedException, "Did not translate functions in expression " << expression);
}
};
diff --git a/src/storm/storage/jani/traverser/ArrayExpressionFinder.cpp b/src/storm/storage/jani/traverser/ArrayExpressionFinder.cpp
index 8ade7df61..ffd5ec641 100644
--- a/src/storm/storage/jani/traverser/ArrayExpressionFinder.cpp
+++ b/src/storm/storage/jani/traverser/ArrayExpressionFinder.cpp
@@ -36,7 +36,7 @@ namespace storm {
boost::any_cast<bool>(expression.getSecondOperand()->accept(*this, data));
}
- virtual boost::any visit(storm::expressions::VariableExpression const& expression, boost::any const&) override {
+ virtual boost::any visit(storm::expressions::VariableExpression const&, boost::any const&) override {
return false;
}
@@ -48,27 +48,27 @@ namespace storm {
return expression.getOperand()->accept(*this, data);
}
- virtual boost::any visit(storm::expressions::BooleanLiteralExpression const& expression, boost::any const&) override {
+ virtual boost::any visit(storm::expressions::BooleanLiteralExpression const&, boost::any const&) override {
return false;
}
- virtual boost::any visit(storm::expressions::IntegerLiteralExpression const& expression, boost::any const&) override {
+ virtual boost::any visit(storm::expressions::IntegerLiteralExpression const&, boost::any const&) override {
return false;
}
- virtual boost::any visit(storm::expressions::RationalLiteralExpression const& expression, boost::any const&) override {
+ virtual boost::any visit(storm::expressions::RationalLiteralExpression const&, boost::any const&) override {
return false;
}
- virtual boost::any visit(storm::expressions::ValueArrayExpression const& expression, boost::any const& data) override {
+ virtual boost::any visit(storm::expressions::ValueArrayExpression const&, boost::any const&) override {
return true;
}
- virtual boost::any visit(storm::expressions::ConstructorArrayExpression const& expression, boost::any const& data) override {
+ virtual boost::any visit(storm::expressions::ConstructorArrayExpression const&, boost::any const&) override {
return true;
}
- virtual boost::any visit(storm::expressions::ArrayAccessExpression const& expression, boost::any const& data) override {
+ virtual boost::any visit(storm::expressions::ArrayAccessExpression const&, boost::any const&) override {
return true;
}
diff --git a/src/storm/storage/jani/traverser/JaniTraverser.cpp b/src/storm/storage/jani/traverser/JaniTraverser.cpp
index 7682c9a88..e77377a15 100644
--- a/src/storm/storage/jani/traverser/JaniTraverser.cpp
+++ b/src/storm/storage/jani/traverser/JaniTraverser.cpp
@@ -26,7 +26,7 @@ namespace storm {
}
}
- void JaniTraverser::traverse(Action const& action, boost::any const& data) {
+ void JaniTraverser::traverse(Action const&, boost::any const&) {
// Intentionally left empty.
}
@@ -166,7 +166,7 @@ namespace storm {
}
}
- void JaniTraverser::traverse(storm::expressions::Expression const& expression, boost::any const& data) {
+ void JaniTraverser::traverse(storm::expressions::Expression const&, boost::any const&) {
// intentionally left empty.
}
@@ -192,7 +192,7 @@ namespace storm {
}
}
- void ConstJaniTraverser::traverse(Action const& action, boost::any const& data) {
+ void ConstJaniTraverser::traverse(Action const&, boost::any const&) {
// Intentionally left empty.
}
@@ -331,7 +331,7 @@ namespace storm {
}
}
- void ConstJaniTraverser::traverse(storm::expressions::Expression const& expression, boost::any const& data) {
+ void ConstJaniTraverser::traverse(storm::expressions::Expression const&, boost::any const&) {
// intentionally left empty.
}
diff --git a/src/storm/transformer/GoalStateMerger.cpp b/src/storm/transformer/GoalStateMerger.cpp
index 7707bd3f1..4c3bf0898 100644
--- a/src/storm/transformer/GoalStateMerger.cpp
+++ b/src/storm/transformer/GoalStateMerger.cpp
@@ -276,7 +276,7 @@ namespace storm {
}
template <typename SparseModelType>
- std::shared_ptr<SparseModelType> GoalStateMerger<SparseModelType>::buildOutputModel(storm::storage::BitVector const& maybeStates, GoalStateMerger::ReturnType const& resultData, storm::storage::SparseMatrix<typename SparseModelType::ValueType>&& transitionMatrix, storm::models::sparse::StateLabeling&& labeling, std::unordered_map<std::string, typename SparseModelType::RewardModelType>&& rewardModels) const {
+ std::shared_ptr<SparseModelType> GoalStateMerger<SparseModelType>::buildOutputModel(storm::storage::BitVector const&, GoalStateMerger::ReturnType const&, storm::storage::SparseMatrix<typename SparseModelType::ValueType>&& transitionMatrix, storm::models::sparse::StateLabeling&& labeling, std::unordered_map<std::string, typename SparseModelType::RewardModelType>&& rewardModels) const {
return std::make_shared<SparseModelType>(std::move(transitionMatrix), std::move(labeling), std::move(rewardModels));
}
diff --git a/src/storm/utility/ConstantsComparator.cpp b/src/storm/utility/ConstantsComparator.cpp
index 2b7aad2d9..48ff1ee22 100644
--- a/src/storm/utility/ConstantsComparator.cpp
+++ b/src/storm/utility/ConstantsComparator.cpp
@@ -142,11 +142,11 @@ namespace storm {
}
}
- bool ConstantsComparator<storm::RationalNumber>::isConstant(storm::RationalNumber const& value) const {
+ bool ConstantsComparator<storm::RationalNumber>::isConstant(storm::RationalNumber const&) const {
return true;
}
- bool ConstantsComparator<storm::RationalNumber>::isInfinity(storm::RationalNumber const& value) const {
+ bool ConstantsComparator<storm::RationalNumber>::isInfinity(storm::RationalNumber const&) const {
return false;
}
diff --git a/src/storm/utility/DirectEncodingExporter.cpp b/src/storm/utility/DirectEncodingExporter.cpp
index ec29cbe1e..3ab53f36e 100644
--- a/src/storm/utility/DirectEncodingExporter.cpp
+++ b/src/storm/utility/DirectEncodingExporter.cpp
@@ -145,7 +145,7 @@ namespace storm {
}
template<typename ValueType>
- std::vector<std::string> getParameters(std::shared_ptr<storm::models::sparse::Model<ValueType>> sparseModel) {
+ std::vector<std::string> getParameters(std::shared_ptr<storm::models::sparse::Model<ValueType>>) {
return {};
}
diff --git a/src/storm/utility/VectorHelper.cpp b/src/storm/utility/VectorHelper.cpp
index 42d2fa970..ca40c8844 100644
--- a/src/storm/utility/VectorHelper.cpp
+++ b/src/storm/utility/VectorHelper.cpp
@@ -43,7 +43,7 @@ namespace storm {
}
template<>
- void VectorHelper<storm::RationalFunction>::reduceVector(storm::solver::OptimizationDirection dir, std::vector<storm::RationalFunction> const& source, std::vector<storm::RationalFunction>& target, std::vector<uint_fast64_t> const& rowGrouping, std::vector<uint_fast64_t>* choices) const {
+ void VectorHelper<storm::RationalFunction>::reduceVector(storm::solver::OptimizationDirection, std::vector<storm::RationalFunction> const&, std::vector<storm::RationalFunction>&, std::vector<uint_fast64_t> const&, std::vector<uint_fast64_t>*) const {
STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "This operation is not supported.");
}
diff --git a/src/storm/utility/constants.cpp b/src/storm/utility/constants.cpp
index d5c48a89b..050955956 100644
--- a/src/storm/utility/constants.cpp
+++ b/src/storm/utility/constants.cpp
@@ -46,7 +46,7 @@ namespace storm {
}
template<typename ValueType>
- bool isNan(ValueType const& value) {
+ bool isNan(ValueType const&) {
return false;
}