Browse Source

Fixed creation of LpMinMaxSolver with the generalMinMaxSolverFactory

tempestpy_adaptions
TimQu 7 years ago
parent
commit
89f1796c56
  1. 3
      src/storm/solver/MinMaxLinearEquationSolver.cpp

3
src/storm/solver/MinMaxLinearEquationSolver.cpp

@ -5,6 +5,7 @@
#include "storm/solver/LinearEquationSolver.h" #include "storm/solver/LinearEquationSolver.h"
#include "storm/solver/IterativeMinMaxLinearEquationSolver.h" #include "storm/solver/IterativeMinMaxLinearEquationSolver.h"
#include "storm/solver/TopologicalMinMaxLinearEquationSolver.h" #include "storm/solver/TopologicalMinMaxLinearEquationSolver.h"
#include "storm/solver/LpMinMaxLinearEquationSolver.h"
#include "storm/settings/SettingsManager.h" #include "storm/settings/SettingsManager.h"
#include "storm/settings/modules/MinMaxEquationSolverSettings.h" #include "storm/settings/modules/MinMaxEquationSolverSettings.h"
@ -195,6 +196,8 @@ namespace storm {
result = std::make_unique<IterativeMinMaxLinearEquationSolver<ValueType>>(std::forward<MatrixType>(matrix), std::make_unique<GeneralLinearEquationSolverFactory<ValueType>>(), iterativeSolverSettings); result = std::make_unique<IterativeMinMaxLinearEquationSolver<ValueType>>(std::forward<MatrixType>(matrix), std::make_unique<GeneralLinearEquationSolverFactory<ValueType>>(), iterativeSolverSettings);
} else if (method == MinMaxMethod::Topological) { } else if (method == MinMaxMethod::Topological) {
result = std::make_unique<TopologicalMinMaxLinearEquationSolver<ValueType>>(std::forward<MatrixType>(matrix)); result = std::make_unique<TopologicalMinMaxLinearEquationSolver<ValueType>>(std::forward<MatrixType>(matrix));
} else if (method == MinMaxMethod::LinearProgramming) {
result = std::make_unique<LpMinMaxLinearEquationSolver<ValueType>>(std::forward<MatrixType>(matrix), std::make_unique<GeneralLinearEquationSolverFactory<ValueType>>(), std::make_unique<storm::utility::solver::LpSolverFactory>());
} else { } else {
STORM_LOG_THROW(false, storm::exceptions::InvalidSettingsException, "Unsupported technique."); STORM_LOG_THROW(false, storm::exceptions::InvalidSettingsException, "Unsupported technique.");
} }
Loading…
Cancel
Save