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

allowing constant definition string to refer to other variables on the right-hand side of assignments, added convergence statement in eigen solver

tempestpy_adaptions
dehnert 8 years ago
parent
c5ba425e54
commit
398c317a7d
3 changed files with 37 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 40
      src/storm/solver/EigenLinearEquationSolver.cpp
  2. 2
      src/storm/solver/GmmxxLinearEquationSolver.cpp
  3. 6
      src/storm/utility/cli.cpp

40
src/storm/solver/EigenLinearEquationSolver.cpp
View File

@ -140,6 +140,9 @@ namespace storm {
solver.compute(*this->eigenA);
solver._solve_impl(eigenB, eigenX);
} else {
bool converged = false;
uint64_t numberOfIterations = 0;
typename EigenLinearEquationSolverSettings<ValueType>::Preconditioner preconditioner = this->getSettings().getPreconditioner();
if (solutionMethod == EigenLinearEquationSolverSettings<ValueType>::SolutionMethod::BiCGSTAB) {
if (preconditioner == EigenLinearEquationSolverSettings<ValueType>::Preconditioner::Ilu) {
@ -148,21 +151,24 @@ namespace storm {
solver.setTolerance(this->getSettings().getPrecision());
solver.setMaxIterations(this->getSettings().getMaximalNumberOfIterations());
eigenX = solver.solveWithGuess(eigenB, eigenX);
return solver.info() == StormEigen::ComputationInfo::Success;
converged = solver.info() == StormEigen::ComputationInfo::Success;
numberOfIterations = solver.iterations();
} else if (preconditioner == EigenLinearEquationSolverSettings<ValueType>::Preconditioner::Diagonal) {
StormEigen::BiCGSTAB<StormEigen::SparseMatrix<ValueType>, StormEigen::DiagonalPreconditioner<ValueType>> solver;
solver.setTolerance(this->getSettings().getPrecision());
solver.setMaxIterations(this->getSettings().getMaximalNumberOfIterations());
solver.compute(*this->eigenA);
eigenX = solver.solveWithGuess(eigenB, eigenX);
return solver.info() == StormEigen::ComputationInfo::Success;
converged = solver.info() == StormEigen::ComputationInfo::Success;
numberOfIterations = solver.iterations();
} else {
StormEigen::BiCGSTAB<StormEigen::SparseMatrix<ValueType>, StormEigen::IdentityPreconditioner> solver;
solver.setTolerance(this->getSettings().getPrecision());
solver.setMaxIterations(this->getSettings().getMaximalNumberOfIterations());
solver.compute(*this->eigenA);
eigenX = solver.solveWithGuess(eigenB, eigenX);
return solver.info() == StormEigen::ComputationInfo::Success;
numberOfIterations = solver.iterations();
converged = solver.info() == StormEigen::ComputationInfo::Success;
}
} else if (solutionMethod == EigenLinearEquationSolverSettings<ValueType>::SolutionMethod::DGMRES) {
if (preconditioner == EigenLinearEquationSolverSettings<ValueType>::Preconditioner::Ilu) {
@ -172,7 +178,8 @@ namespace storm {
solver.set_restart(this->getSettings().getNumberOfIterationsUntilRestart());
solver.compute(*this->eigenA);
eigenX = solver.solveWithGuess(eigenB, eigenX);
return solver.info() == StormEigen::ComputationInfo::Success;
converged = solver.info() == StormEigen::ComputationInfo::Success;
numberOfIterations = solver.iterations();
} else if (preconditioner == EigenLinearEquationSolverSettings<ValueType>::Preconditioner::Diagonal) {
StormEigen::DGMRES<StormEigen::SparseMatrix<ValueType>, StormEigen::DiagonalPreconditioner<ValueType>> solver;
solver.setTolerance(this->getSettings().getPrecision());
@ -180,7 +187,8 @@ namespace storm {
solver.set_restart(this->getSettings().getNumberOfIterationsUntilRestart());
solver.compute(*this->eigenA);
eigenX = solver.solveWithGuess(eigenB, eigenX);
return solver.info() == StormEigen::ComputationInfo::Success;
converged = solver.info() == StormEigen::ComputationInfo::Success;
numberOfIterations = solver.iterations();
} else {
StormEigen::DGMRES<StormEigen::SparseMatrix<ValueType>, StormEigen::IdentityPreconditioner> solver;
solver.setTolerance(this->getSettings().getPrecision());
@ -188,7 +196,8 @@ namespace storm {
solver.set_restart(this->getSettings().getNumberOfIterationsUntilRestart());
solver.compute(*this->eigenA);
eigenX = solver.solveWithGuess(eigenB, eigenX);
return solver.info() == StormEigen::ComputationInfo::Success;
converged = solver.info() == StormEigen::ComputationInfo::Success;
numberOfIterations = solver.iterations();
}
} else if (solutionMethod == EigenLinearEquationSolverSettings<ValueType>::SolutionMethod::GMRES) {
if (preconditioner == EigenLinearEquationSolverSettings<ValueType>::Preconditioner::Ilu) {
@ -198,7 +207,8 @@ namespace storm {
solver.set_restart(this->getSettings().getNumberOfIterationsUntilRestart());
solver.compute(*this->eigenA);
eigenX = solver.solveWithGuess(eigenB, eigenX);
return solver.info() == StormEigen::ComputationInfo::Success;
converged = solver.info() == StormEigen::ComputationInfo::Success;
numberOfIterations = solver.iterations();
} else if (preconditioner == EigenLinearEquationSolverSettings<ValueType>::Preconditioner::Diagonal) {
StormEigen::GMRES<StormEigen::SparseMatrix<ValueType>, StormEigen::DiagonalPreconditioner<ValueType>> solver;
solver.setTolerance(this->getSettings().getPrecision());
@ -206,7 +216,8 @@ namespace storm {
solver.set_restart(this->getSettings().getNumberOfIterationsUntilRestart());
solver.compute(*this->eigenA);
eigenX = solver.solveWithGuess(eigenB, eigenX);
return solver.info() == StormEigen::ComputationInfo::Success;
converged = solver.info() == StormEigen::ComputationInfo::Success;
numberOfIterations = solver.iterations();
} else {
StormEigen::GMRES<StormEigen::SparseMatrix<ValueType>, StormEigen::IdentityPreconditioner> solver;
solver.setTolerance(this->getSettings().getPrecision());
@ -214,10 +225,21 @@ namespace storm {
solver.set_restart(this->getSettings().getNumberOfIterationsUntilRestart());
solver.compute(*this->eigenA);
eigenX = solver.solveWithGuess(eigenB, eigenX);
return solver.info() == StormEigen::ComputationInfo::Success;
converged = solver.info() == StormEigen::ComputationInfo::Success;
numberOfIterations = solver.iterations();
}
}
// Check if the solver converged and issue a warning otherwise.
if (converged) {
STORM_LOG_DEBUG("Iterative solver converged after " << numberOfIterations << " iterations.");
return true;
} else {
STORM_LOG_WARN("Iterative solver did not converge.");
return false;
}
}
return false;
}

2
src/storm/solver/GmmxxLinearEquationSolver.cpp
View File

@ -187,7 +187,7 @@ namespace storm {
}
}
if(!this->isCachingEnabled()) {
if (!this->isCachingEnabled()) {
clearCache();
}

6
src/storm/utility/cli.cpp
View File

@ -36,7 +36,11 @@ namespace storm {
STORM_LOG_THROW(definedConstants.find(variable) == definedConstants.end(), storm::exceptions::WrongFormatException, "Illegally trying to define constant '" << constantName <<"' twice.");
definedConstants.insert(variable);
if (variable.hasBooleanType()) {
if (manager.hasVariable(value)) {
auto const& valueVariable = manager.getVariable(value);
STORM_LOG_THROW(variable.getType() == valueVariable.getType(), storm::exceptions::WrongFormatException, "Illegally trying to define constant '" << constantName << "' by constant '" << valueVariable.getName() << " of different type.");
constantDefinitions[variable] = valueVariable.getExpression();
} else if (variable.hasBooleanType()) {
if (value == "true") {
constantDefinitions[variable] = manager.boolean(true);
} else if (value == "false") {

Write Preview
Loading…
Cancel
Save