Browse Source

silenced several 'unused parameter'-warnings

tempestpy_adaptions
TimQu 6 years ago
parent
commit
4dc234d635
  1. 4
      src/storm/solver/EigenLinearEquationSolver.cpp
  2. 2
      src/storm/solver/LinearEquationSolver.cpp
  3. 2
      src/storm/solver/StandardGameSolver.cpp
  4. 8
      src/storm/storage/expressions/CheckIfThenElseGuardVisitor.cpp
  5. 2
      src/storm/storage/geometry/nativepolytopeconversion/SubsetEnumerator.cpp
  6. 20
      src/storm/storage/jani/ArrayEliminator.cpp
  7. 6
      src/storm/storage/jani/FunctionEliminator.cpp
  8. 14
      src/storm/storage/jani/traverser/ArrayExpressionFinder.cpp
  9. 8
      src/storm/storage/jani/traverser/JaniTraverser.cpp
  10. 2
      src/storm/transformer/GoalStateMerger.cpp
  11. 4
      src/storm/utility/ConstantsComparator.cpp
  12. 2
      src/storm/utility/DirectEncodingExporter.cpp
  13. 2
      src/storm/utility/VectorHelper.cpp
  14. 2
      src/storm/utility/constants.cpp

4
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>>();
}

2
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();
}

2
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;

8
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;
}

2
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;
}

20
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()));
}

6
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);
}
};

14
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;
}

8
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.
}

2
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));
}

4
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;
}

2
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 {};
}

2
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.");
}

2
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;
}

Loading…
Cancel
Save