sp
/
tempest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Fixed missing typenames and member initialization reordering. 

Former-commit-id: bdf24399d6
main
PBerger 11 years ago
parent
0c3c057f83
commit
3bb0346407
3 changed files with 9 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      resources/cmake/FindGMP.cmake
  2. 6
      src/solver/GmmxxMinMaxLinearEquationSolver.cpp
  3. 6
      src/solver/NativeMinMaxLinearEquationSolver.cpp

2
resources/cmake/FindGMP.cmake
View File

@ -45,7 +45,7 @@ if(GMP_FOUND)
endif() endif()
elseif(MPIR_FOUND) elseif(MPIR_FOUND)
if(NOT GMP_FIND_QUIETLY) if(NOT GMP_FIND_QUIETLY)
MESSAGE(STATUS "Found GMP alternative MPIR: ${MPIR_LIBRARY} and ${MPIRXX_LIBRARY}")
MESSAGE(STATUS "Found GMP alternative MPIR: ${GMP_MPIR_LIBRARY} and ${GMP_MPIRXX_LIBRARY}")
endif() endif()
elseif(GMP_FOUND) elseif(GMP_FOUND)
if(GMP_FIND_REQUIRED) if(GMP_FIND_REQUIRED)

6
src/solver/GmmxxMinMaxLinearEquationSolver.cpp
View File

@ -17,14 +17,14 @@ namespace storm {
storm::settings::modules::GeneralSettings const& generalSettings = storm::settings::generalSettings(); storm::settings::modules::GeneralSettings const& generalSettings = storm::settings::generalSettings();
// Get appropriate settings. // Get appropriate settings.
maximalNumberOfIterations = settings.getMaximalIterationCount();
precision = settings.getPrecision(); precision = settings.getPrecision();
relative = settings.getConvergenceCriterion() == storm::settings::modules::GmmxxEquationSolverSettings::ConvergenceCriterion::Relative; relative = settings.getConvergenceCriterion() == storm::settings::modules::GmmxxEquationSolverSettings::ConvergenceCriterion::Relative;
maximalNumberOfIterations = settings.getMaximalIterationCount();
useValueIteration = (generalSettings.getMinMaxEquationSolvingTechnique() == storm::settings::modules::GeneralSettings::MinMaxTechnique::ValueIteration); useValueIteration = (generalSettings.getMinMaxEquationSolvingTechnique() == storm::settings::modules::GeneralSettings::MinMaxTechnique::ValueIteration);
} }
template<typename ValueType> template<typename ValueType>
GmmxxMinMaxLinearEquationSolver<ValueType>::GmmxxMinMaxLinearEquationSolver(storm::storage::SparseMatrix<ValueType> const& A, double precision, uint_fast64_t maximalNumberOfIterations, bool useValueIteration, bool relative) : gmmxxMatrix(storm::adapters::GmmxxAdapter::toGmmxxSparseMatrix<ValueType>(A)), stormMatrix(A), rowGroupIndices(A.getRowGroupIndices()), precision(precision), maximalNumberOfIterations(maximalNumberOfIterations), useValueIteration(useValueIteration), relative(relative) {
GmmxxMinMaxLinearEquationSolver<ValueType>::GmmxxMinMaxLinearEquationSolver(storm::storage::SparseMatrix<ValueType> const& A, double precision, uint_fast64_t maximalNumberOfIterations, bool useValueIteration, bool relative) : gmmxxMatrix(storm::adapters::GmmxxAdapter::toGmmxxSparseMatrix<ValueType>(A)), stormMatrix(A), rowGroupIndices(A.getRowGroupIndices()), precision(precision), relative(relative), maximalNumberOfIterations(maximalNumberOfIterations), useValueIteration(useValueIteration) {
// Intentionally left empty. // Intentionally left empty.
} }
@ -96,7 +96,7 @@ namespace storm {
} else { } else {
// We will use Policy Iteration to solve the given system. // We will use Policy Iteration to solve the given system.
// We first guess an initial choice resolution which will be refined after each iteration. // We first guess an initial choice resolution which will be refined after each iteration.
std::vector<storm::storage::SparseMatrix<ValueType>::index_type> choiceVector(rowGroupIndices.size() - 1);
std::vector<typename storm::storage::SparseMatrix<ValueType>::index_type> choiceVector(rowGroupIndices.size() - 1);
// Create our own multiplyResult for solving the deterministic sub-instances. // Create our own multiplyResult for solving the deterministic sub-instances.
std::vector<ValueType> deterministicMultiplyResult(rowGroupIndices.size() - 1); std::vector<ValueType> deterministicMultiplyResult(rowGroupIndices.size() - 1);

6
src/solver/NativeMinMaxLinearEquationSolver.cpp
View File

@ -16,14 +16,14 @@ namespace storm {
storm::settings::modules::GeneralSettings const& generalSettings = storm::settings::generalSettings(); storm::settings::modules::GeneralSettings const& generalSettings = storm::settings::generalSettings();
// Get appropriate settings. // Get appropriate settings.
maximalNumberOfIterations = settings.getMaximalIterationCount();
precision = settings.getPrecision(); precision = settings.getPrecision();
relative = settings.getConvergenceCriterion() == storm::settings::modules::NativeEquationSolverSettings::ConvergenceCriterion::Relative; relative = settings.getConvergenceCriterion() == storm::settings::modules::NativeEquationSolverSettings::ConvergenceCriterion::Relative;
maximalNumberOfIterations = settings.getMaximalIterationCount();
useValueIteration = (generalSettings.getMinMaxEquationSolvingTechnique() == storm::settings::modules::GeneralSettings::MinMaxTechnique::ValueIteration); useValueIteration = (generalSettings.getMinMaxEquationSolvingTechnique() == storm::settings::modules::GeneralSettings::MinMaxTechnique::ValueIteration);
} }
template<typename ValueType> template<typename ValueType>
NativeMinMaxLinearEquationSolver<ValueType>::NativeMinMaxLinearEquationSolver(storm::storage::SparseMatrix<ValueType> const& A, double precision, uint_fast64_t maximalNumberOfIterations, bool useValueIteration, bool relative) : A(A), precision(precision), maximalNumberOfIterations(maximalNumberOfIterations), useValueIteration(useValueIteration), relative(relative) {
NativeMinMaxLinearEquationSolver<ValueType>::NativeMinMaxLinearEquationSolver(storm::storage::SparseMatrix<ValueType> const& A, double precision, uint_fast64_t maximalNumberOfIterations, bool useValueIteration, bool relative) : A(A), precision(precision), relative(relative), maximalNumberOfIterations(maximalNumberOfIterations), useValueIteration(useValueIteration) {
// Intentionally left empty. // Intentionally left empty.
} }
@ -94,7 +94,7 @@ namespace storm {
} else { } else {
// We will use Policy Iteration to solve the given system. // We will use Policy Iteration to solve the given system.
// We first guess an initial choice resolution which will be refined after each iteration. // We first guess an initial choice resolution which will be refined after each iteration.
std::vector<storm::storage::SparseMatrix<ValueType>::index_type> choiceVector(A.getRowGroupIndices().size() - 1);
std::vector<typename storm::storage::SparseMatrix<ValueType>::index_type> choiceVector(A.getRowGroupIndices().size() - 1);
// Create our own multiplyResult for solving the deterministic sub-instances. // Create our own multiplyResult for solving the deterministic sub-instances.
std::vector<ValueType> deterministicMultiplyResult(A.getRowGroupIndices().size() - 1); std::vector<ValueType> deterministicMultiplyResult(A.getRowGroupIndices().size() - 1);

Write Preview
Loading…
Cancel
Save