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

Some of the tests still did not compile with cln as rational number

main
TimQu 8 years ago
parent
78fb458154
commit
37bca625e5
3 changed files with 25 additions and 25 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. 10
      src/test/storm/modelchecker/ConditionalDtmcPrctlModelCheckerTest.cpp
  2. 12
      src/test/storm/modelchecker/LraDtmcPrctlModelCheckerTest.cpp
  3. 28
      src/test/storm/solver/LinearEquationSolverTest.cpp

10
src/test/storm/modelchecker/ConditionalDtmcPrctlModelCheckerTest.cpp
View File

@ -19,28 +19,28 @@ namespace {
class GmmxxDoubleGmresEnvironment { class GmmxxDoubleGmresEnvironment {
public: public:
typedef storm::RationalNumber ValueType;
typedef double ValueType;
static const bool isExact = false; static const bool isExact = false;
static storm::Environment createEnvironment() { static storm::Environment createEnvironment() {
storm::Environment env; storm::Environment env;
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx);
env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres); env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres);
env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Ilu); env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Ilu);
env.solver().gmmxx().setPrecision(storm::utility::convertNumber<ValueType>(1e-8));
env.solver().gmmxx().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-8));
return env; return env;
} }
}; };
class EigenDoubleDGmresEnvironment { class EigenDoubleDGmresEnvironment {
public: public:
typedef storm::RationalNumber ValueType;
typedef double ValueType;
static const bool isExact = false; static const bool isExact = false;
static storm::Environment createEnvironment() { static storm::Environment createEnvironment() {
storm::Environment env; storm::Environment env;
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Eigen); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Eigen);
env.solver().eigen().setMethod(storm::solver::EigenLinearEquationSolverMethod::DGmres); env.solver().eigen().setMethod(storm::solver::EigenLinearEquationSolverMethod::DGmres);
env.solver().eigen().setPreconditioner(storm::solver::EigenLinearEquationSolverPreconditioner::Ilu); env.solver().eigen().setPreconditioner(storm::solver::EigenLinearEquationSolverPreconditioner::Ilu);
env.solver().eigen().setPrecision(storm::utility::convertNumber<ValueType>(1e-8));
env.solver().eigen().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-8));
return env; return env;
} }
}; };
@ -65,7 +65,7 @@ namespace {
storm::Environment env; storm::Environment env;
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native);
env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::SOR); env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::SOR);
env.solver().native().setSorOmega(storm::utility::convertNumber<ValueType>(0.9));
env.solver().native().setSorOmega(storm::utility::convertNumber<storm::RationalNumber>(0.9));
env.solver().native().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-8)); env.solver().native().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-8));
return env; return env;
} }

12
src/test/storm/modelchecker/LraDtmcPrctlModelCheckerTest.cpp
View File

@ -24,35 +24,35 @@ namespace {
class GmmxxDoubleGmresEnvironment { class GmmxxDoubleGmresEnvironment {
public: public:
typedef storm::RationalNumber ValueType;
typedef double ValueType;
static const bool isExact = false; static const bool isExact = false;
static storm::Environment createEnvironment() { static storm::Environment createEnvironment() {
storm::Environment env; storm::Environment env;
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx);
env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres); env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres);
env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Ilu); env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Ilu);
env.solver().gmmxx().setPrecision(storm::utility::convertNumber<ValueType>(1e-8));
env.solver().gmmxx().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-8));
return env; return env;
} }
}; };
class EigenDoubleDGmresEnvironment { class EigenDoubleDGmresEnvironment {
public: public:
typedef storm::RationalNumber ValueType;
typedef double ValueType;
static const bool isExact = false; static const bool isExact = false;
static storm::Environment createEnvironment() { static storm::Environment createEnvironment() {
storm::Environment env; storm::Environment env;
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Eigen); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Eigen);
env.solver().eigen().setMethod(storm::solver::EigenLinearEquationSolverMethod::DGmres); env.solver().eigen().setMethod(storm::solver::EigenLinearEquationSolverMethod::DGmres);
env.solver().eigen().setPreconditioner(storm::solver::EigenLinearEquationSolverPreconditioner::Ilu); env.solver().eigen().setPreconditioner(storm::solver::EigenLinearEquationSolverPreconditioner::Ilu);
env.solver().eigen().setPrecision(storm::utility::convertNumber<ValueType>(1e-8));
env.solver().eigen().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-8));
return env; return env;
} }
}; };
class EigenRationalLUEnvironment { class EigenRationalLUEnvironment {
public: public:
typedef storm::RationalNumber ValueType;
typedef double ValueType;
static const bool isExact = true; static const bool isExact = true;
static storm::Environment createEnvironment() { static storm::Environment createEnvironment() {
storm::Environment env; storm::Environment env;
@ -70,7 +70,7 @@ namespace {
storm::Environment env; storm::Environment env;
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native);
env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::SOR); env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::SOR);
env.solver().native().setSorOmega(storm::utility::convertNumber<ValueType>(0.9));
env.solver().native().setSorOmega(storm::utility::convertNumber<storm::RationalNumber>(0.9));
env.solver().native().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-8)); env.solver().native().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-8));
return env; return env;
} }

28
src/test/storm/solver/LinearEquationSolverTest.cpp
View File

@ -18,7 +18,7 @@ namespace {
storm::Environment env; storm::Environment env;
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native);
env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::Power); env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::Power);
env.solver().native().setPrecision(storm::utility::convertNumber<ValueType, std::string>("1e-10"));
env.solver().native().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-10"));
return env; return env;
} }
}; };
@ -33,7 +33,7 @@ namespace {
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native);
env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::Power); env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::Power);
env.solver().native().setRelativeTerminationCriterion(false); env.solver().native().setRelativeTerminationCriterion(false);
env.solver().native().setPrecision(storm::utility::convertNumber<ValueType, std::string>("1e-6"));
env.solver().native().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-6"));
return env; return env;
} }
}; };
@ -46,7 +46,7 @@ namespace {
storm::Environment env; storm::Environment env;
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native);
env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::Jacobi); env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::Jacobi);
env.solver().native().setPrecision(storm::utility::convertNumber<ValueType, std::string>("1e-10"));
env.solver().native().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-10"));
return env; return env;
} }
}; };
@ -59,7 +59,7 @@ namespace {
storm::Environment env; storm::Environment env;
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native);
env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::GaussSeidel); env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::GaussSeidel);
env.solver().native().setPrecision(storm::utility::convertNumber<ValueType, std::string>("1e-10"));
env.solver().native().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-10"));
return env; return env;
} }
}; };
@ -72,7 +72,7 @@ namespace {
storm::Environment env; storm::Environment env;
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native);
env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::SOR); env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::SOR);
env.solver().native().setPrecision(storm::utility::convertNumber<ValueType, std::string>("1e-10"));
env.solver().native().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-10"));
return env; return env;
} }
}; };
@ -85,7 +85,7 @@ namespace {
storm::Environment env; storm::Environment env;
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native);
env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::WalkerChae); env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::WalkerChae);
env.solver().native().setPrecision(storm::utility::convertNumber<ValueType, std::string>("1e-8"));
env.solver().native().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-8"));
env.solver().native().setMaximalNumberOfIterations(500000); env.solver().native().setMaximalNumberOfIterations(500000);
return env; return env;
} }
@ -123,7 +123,7 @@ namespace {
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx);
env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres); env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres);
env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Ilu); env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Ilu);
env.solver().gmmxx().setPrecision(storm::utility::convertNumber<ValueType, std::string>("1e-8"));
env.solver().gmmxx().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-8"));
return env; return env;
} }
}; };
@ -137,7 +137,7 @@ namespace {
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx);
env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres); env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres);
env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Diagonal); env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Diagonal);
env.solver().gmmxx().setPrecision(storm::utility::convertNumber<ValueType, std::string>("1e-8"));
env.solver().gmmxx().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-8"));
return env; return env;
} }
}; };
@ -151,7 +151,7 @@ namespace {
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx);
env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres); env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Gmres);
env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::None); env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::None);
env.solver().gmmxx().setPrecision(storm::utility::convertNumber<ValueType, std::string>("1e-8"));
env.solver().gmmxx().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-8"));
return env; return env;
} }
}; };
@ -165,7 +165,7 @@ namespace {
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx);
env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Bicgstab); env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Bicgstab);
env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Ilu); env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Ilu);
env.solver().gmmxx().setPrecision(storm::utility::convertNumber<ValueType, std::string>("1e-8"));
env.solver().gmmxx().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-8"));
return env; return env;
} }
}; };
@ -179,7 +179,7 @@ namespace {
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Gmmxx);
env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Qmr); env.solver().gmmxx().setMethod(storm::solver::GmmxxLinearEquationSolverMethod::Qmr);
env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Diagonal); env.solver().gmmxx().setPreconditioner(storm::solver::GmmxxLinearEquationSolverPreconditioner::Diagonal);
env.solver().gmmxx().setPrecision(storm::utility::convertNumber<ValueType, std::string>("1e-8"));
env.solver().gmmxx().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-8"));
return env; return env;
} }
}; };
@ -193,7 +193,7 @@ namespace {
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Eigen); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Eigen);
env.solver().eigen().setMethod(storm::solver::EigenLinearEquationSolverMethod::DGmres); env.solver().eigen().setMethod(storm::solver::EigenLinearEquationSolverMethod::DGmres);
env.solver().eigen().setPreconditioner(storm::solver::EigenLinearEquationSolverPreconditioner::Diagonal); env.solver().eigen().setPreconditioner(storm::solver::EigenLinearEquationSolverPreconditioner::Diagonal);
env.solver().eigen().setPrecision(storm::utility::convertNumber<ValueType, std::string>("1e-8"));
env.solver().eigen().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-8"));
return env; return env;
} }
}; };
@ -207,7 +207,7 @@ namespace {
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Eigen); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Eigen);
env.solver().eigen().setMethod(storm::solver::EigenLinearEquationSolverMethod::Gmres); env.solver().eigen().setMethod(storm::solver::EigenLinearEquationSolverMethod::Gmres);
env.solver().eigen().setPreconditioner(storm::solver::EigenLinearEquationSolverPreconditioner::Ilu); env.solver().eigen().setPreconditioner(storm::solver::EigenLinearEquationSolverPreconditioner::Ilu);
env.solver().eigen().setPrecision(storm::utility::convertNumber<ValueType, std::string>("1e-8"));
env.solver().eigen().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-8"));
return env; return env;
} }
}; };
@ -221,7 +221,7 @@ namespace {
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Eigen); env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Eigen);
env.solver().eigen().setMethod(storm::solver::EigenLinearEquationSolverMethod::Bicgstab); env.solver().eigen().setMethod(storm::solver::EigenLinearEquationSolverMethod::Bicgstab);
env.solver().eigen().setPreconditioner(storm::solver::EigenLinearEquationSolverPreconditioner::None); env.solver().eigen().setPreconditioner(storm::solver::EigenLinearEquationSolverPreconditioner::None);
env.solver().eigen().setPrecision(storm::utility::convertNumber<ValueType, std::string>("1e-8"));
env.solver().eigen().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-8"));
return env; return env;
} }
}; };

Write Preview
Loading…
Cancel
Save