Browse Source

removed residual function calls

tempestpy_adaptions
Stefan Pranger 4 years ago
parent
commit
7c31774678
  1. 3
      src/storm/modelchecker/helper/infinitehorizon/internal/LraViHelper.cpp
  2. 1
      src/storm/modelchecker/rpatl/helper/internal/GameViHelper.cpp
  3. 5
      src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp

3
src/storm/modelchecker/helper/infinitehorizon/internal/LraViHelper.cpp

@ -332,9 +332,6 @@ namespace storm {
_TsToIsMultiplier = storm::solver::MultiplierFactory<ValueType>().create(env, _TsToIsTransitions); _TsToIsMultiplier = storm::solver::MultiplierFactory<ValueType>().create(env, _TsToIsTransitions);
_IsToTsMultiplier = storm::solver::MultiplierFactory<ValueType>().create(env, _IsToTsTransitions); _IsToTsMultiplier = storm::solver::MultiplierFactory<ValueType>().create(env, _IsToTsTransitions);
} }
if(env.solver().multiplier().getOptimizationDirectionOverride().is_initialized()) {
_TsMultiplier->setOptimizationDirectionOverride(env.solver().multiplier().getOptimizationDirectionOverride().get());
}
} }
template <typename ValueType, typename ComponentType, LraViTransitionsType TransitionsType> template <typename ValueType, typename ComponentType, LraViTransitionsType TransitionsType>

1
src/storm/modelchecker/rpatl/helper/internal/GameViHelper.cpp

@ -26,7 +26,6 @@ namespace storm {
// -> compute b vector from psiStates // -> compute b vector from psiStates
// -> clip transitionmatrix and create multiplier // -> clip transitionmatrix and create multiplier
_multiplier = storm::solver::MultiplierFactory<ValueType>().create(env, _transitionMatrix); _multiplier = storm::solver::MultiplierFactory<ValueType>().create(env, _transitionMatrix);
_multiplier->setOptimizationDirectionOverride(_statesOfCoalition);
_x1IsCurrent = false; _x1IsCurrent = false;
} }

5
src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp

@ -415,11 +415,6 @@ namespace storm {
this->multiplierA = storm::solver::MultiplierFactory<ValueType>().create(env, *this->A); this->multiplierA = storm::solver::MultiplierFactory<ValueType>().create(env, *this->A);
} }
// TODO cleanup
if(env.solver().multiplier().getOptimizationDirectionOverride().is_initialized()) {
multiplierA->setOptimizationDirectionOverride(env.solver().multiplier().getOptimizationDirectionOverride().get());
}
if (!auxiliaryRowGroupVector) { if (!auxiliaryRowGroupVector) {
auxiliaryRowGroupVector = std::make_unique<std::vector<ValueType>>(this->A->getRowGroupCount()); auxiliaryRowGroupVector = std::make_unique<std::vector<ValueType>>(this->A->getRowGroupCount());
} }

Loading…
Cancel
Save