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

Adding MultiplierTest

tempestpy_adaptions
TimQu 7 years ago
parent
69a27ddad6
commit
4690ac1faf
3 changed files with 142 additions and 76 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. 33
      src/test/storm/solver/LinearEquationSolverTest.cpp
  2. 62
      src/test/storm/solver/MinMaxLinearEquationSolverTest.cpp
  3. 123
      src/test/storm/solver/MultiplierTest.cpp

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

@ -32,14 +32,14 @@ namespace {
storm::Environment env;
env.solver().setForceSoundness(true);
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native);
env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::Power);
env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::SoundPower);
env.solver().native().setRelativeTerminationCriterion(false);
env.solver().native().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-6"));
return env;
}
};
class NativeDoubleQuickSoundPowerEnvironment {
class NativeDoubleIntervalIterationEnvironment {
public:
typedef double ValueType;
static const bool isExact = false;
@ -47,7 +47,7 @@ namespace {
storm::Environment env;
env.solver().setForceSoundness(true);
env.solver().setLinearEquationSolverType(storm::solver::EquationSolverType::Native);
env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::QuickPower);
env.solver().native().setMethod(storm::solver::NativeLinearEquationSolverMethod::IntervalIteration);
env.solver().native().setRelativeTerminationCriterion(false);
env.solver().native().setPrecision(storm::utility::convertNumber<storm::RationalNumber, std::string>("1e-6"));
return env;
@ -294,7 +294,7 @@ namespace {
typedef ::testing::Types<
NativeDoublePowerEnvironment,
NativeDoubleSoundPowerEnvironment,
NativeDoubleQuickSoundPowerEnvironment,
NativeDoubleIntervalIterationEnvironment,
NativeDoubleJacobiEnvironment,
NativeDoubleGaussSeidelEnvironment,
NativeDoubleSorEnvironment,
@ -353,29 +353,4 @@ namespace {
EXPECT_NEAR(x[1], this->parseNumber("457/9"), this->precision());
EXPECT_NEAR(x[2], this->parseNumber("875/18"), this->precision());
}
TYPED_TEST(LinearEquationSolverTest, MatrixVectorMultiplication) {
typedef typename TestFixture::ValueType ValueType;
ASSERT_NO_THROW(storm::storage::SparseMatrixBuilder<ValueType> builder);
storm::storage::SparseMatrixBuilder<ValueType> builder;
ASSERT_NO_THROW(builder.addNextValue(0, 1, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.addNextValue(0, 4, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.addNextValue(1, 2, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.addNextValue(1, 4, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.addNextValue(2, 3, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.addNextValue(2, 4, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.addNextValue(3, 4, this->parseNumber("1")));
ASSERT_NO_THROW(builder.addNextValue(4, 4, this->parseNumber("1")));
storm::storage::SparseMatrix<ValueType> A;
ASSERT_NO_THROW(A = builder.build());
std::vector<ValueType> x(5);
x[4] = this->parseNumber("1");
auto factory = storm::solver::GeneralLinearEquationSolverFactory<ValueType>();
auto solver = factory.create(this->env(), A);
ASSERT_NO_THROW(solver->repeatedMultiply(x, nullptr, 4));
EXPECT_NEAR(x[0], this->parseNumber("1"), this->precision());
}
}

62
src/test/storm/solver/MinMaxLinearEquationSolverTest.cpp
View File

@ -29,7 +29,20 @@ namespace {
static const bool isExact = false;
static storm::Environment createEnvironment() {
storm::Environment env;
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::ValueIteration);
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::SoundValueIteration);
env.solver().setForceSoundness(true);
env.solver().minMax().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-6));
return env;
}
};
class DoubleIntervalIterationEnvironment {
public:
typedef double ValueType;
static const bool isExact = false;
static storm::Environment createEnvironment() {
storm::Environment env;
env.solver().minMax().setMethod(storm::solver::MinMaxMethod::IntervalIteration);
env.solver().setForceSoundness(true);
env.solver().minMax().setPrecision(storm::utility::convertNumber<storm::RationalNumber>(1e-6));
return env;
@ -110,6 +123,7 @@ namespace {
typedef ::testing::Types<
DoubleViEnvironment,
DoubleSoundViEnvironment,
DoubleIntervalIterationEnvironment,
DoubleTopologicalViEnvironment,
DoubleTopologicalCudaViEnvironment,
DoublePIEnvironment,
@ -145,52 +159,6 @@ namespace {
ASSERT_NO_THROW(solver->solveEquations(this->env(), storm::OptimizationDirection::Maximize, x, b));
EXPECT_NEAR(x[0], this->parseNumber("0.99"), this->precision());
}
TYPED_TEST(MinMaxLinearEquationSolverTest, MatrixVectorMultiplication) {
typedef typename TestFixture::ValueType ValueType;
storm::storage::SparseMatrixBuilder<ValueType> builder(0, 0, 0, false, true);
ASSERT_NO_THROW(builder.newRowGroup(0));
ASSERT_NO_THROW(builder.addNextValue(0, 0, this->parseNumber("0.9")));
ASSERT_NO_THROW(builder.addNextValue(0, 1, this->parseNumber("0.099")));
ASSERT_NO_THROW(builder.addNextValue(0, 2, this->parseNumber("0.001")));
ASSERT_NO_THROW(builder.addNextValue(1, 1, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.addNextValue(1, 2, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.newRowGroup(2));
ASSERT_NO_THROW(builder.addNextValue(2, 1, this->parseNumber("1")));
ASSERT_NO_THROW(builder.newRowGroup(3));
ASSERT_NO_THROW(builder.addNextValue(3, 2, this->parseNumber("1")));
storm::storage::SparseMatrix<ValueType> A;
ASSERT_NO_THROW(A = builder.build());
std::vector<ValueType> initialX = {this->parseNumber("0"), this->parseNumber("1"), this->parseNumber("0")};
std::vector<ValueType> x;
auto factory = storm::solver::GeneralMinMaxLinearEquationSolverFactory<ValueType>();
auto solver = factory.create(this->env(), A);
x = initialX;
ASSERT_NO_THROW(solver->repeatedMultiply(this->env(), storm::OptimizationDirection::Minimize, x, nullptr, 1));
EXPECT_NEAR(x[0], this->parseNumber("0.099"), this->precision());
x = initialX;
ASSERT_NO_THROW(solver->repeatedMultiply(this->env(), storm::OptimizationDirection::Minimize, x, nullptr, 2));
EXPECT_NEAR(x[0], this->parseNumber("0.1881"), this->precision());
x = initialX;
ASSERT_NO_THROW(solver->repeatedMultiply(this->env(), storm::OptimizationDirection::Minimize, x, nullptr, 20));
EXPECT_NEAR(x[0], this->parseNumber("0.5"), this->precision());
x = initialX;
ASSERT_NO_THROW(solver->repeatedMultiply(this->env(), storm::OptimizationDirection::Maximize, x, nullptr, 1));
EXPECT_NEAR(x[0], this->parseNumber("0.5"), this->precision());
x = initialX;
ASSERT_NO_THROW(solver->repeatedMultiply(this->env(), storm::OptimizationDirection::Maximize, x, nullptr, 20));
EXPECT_NEAR(x[0], this->parseNumber("0.923808265834023387639"), this->precision());
}
}

123
src/test/storm/solver/MultiplierTest.cpp
View File

@ -0,0 +1,123 @@
#include "gtest/gtest.h"
#include "storm-config.h"
#include "test/storm_gtest.h"
#include "storm/storage/SparseMatrix.h"
#include "storm/solver/Multiplier.h"
#include "storm/environment/solver/MultiplierEnvironment.h"
#include "storm/utility/vector.h"
namespace {
class NativeEnvironment {
public:
typedef double ValueType;
static const bool isExact = false;
static storm::Environment createEnvironment() {
storm::Environment env;
env.solver().multiplier().setType(storm::solver::MultiplierType::Native);
return env;
}
};
class GmmxxEnvironment {
public:
typedef double ValueType;
static const bool isExact = false;
static storm::Environment createEnvironment() {
storm::Environment env;
env.solver().multiplier().setType(storm::solver::MultiplierType::Gmmxx);
return env;
}
};
template<typename TestType>
class MultiplierTest : public ::testing::Test {
public:
typedef typename TestType::ValueType ValueType;
MultiplierTest() : _environment(TestType::createEnvironment()) {}
storm::Environment const& env() const { return _environment; }
ValueType precision() const { return TestType::isExact ? parseNumber("0") : parseNumber("1e-15");}
ValueType parseNumber(std::string const& input) const { return storm::utility::convertNumber<ValueType>(input);}
private:
storm::Environment _environment;
};
typedef ::testing::Types<
NativeEnvironment,
GmmxxEnvironment
> TestingTypes;
TYPED_TEST_CASE(MultiplierTest, TestingTypes);
TYPED_TEST(MultiplierTest, repeatedMultiplyTest) {
typedef typename TestFixture::ValueType ValueType;
ASSERT_NO_THROW(storm::storage::SparseMatrixBuilder<ValueType> builder);
storm::storage::SparseMatrixBuilder<ValueType> builder;
ASSERT_NO_THROW(builder.addNextValue(0, 1, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.addNextValue(0, 4, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.addNextValue(1, 2, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.addNextValue(1, 4, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.addNextValue(2, 3, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.addNextValue(2, 4, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.addNextValue(3, 4, this->parseNumber("1")));
ASSERT_NO_THROW(builder.addNextValue(4, 4, this->parseNumber("1")));
storm::storage::SparseMatrix<ValueType> A;
ASSERT_NO_THROW(A = builder.build());
std::vector<ValueType> x(5);
x[4] = this->parseNumber("1");
auto factory = storm::solver::MultiplierFactory<ValueType>();
auto multiplier = factory.create(this->env(), A);
ASSERT_NO_THROW(multiplier->repeatedMultiply(this->env(), x, nullptr, 4));
EXPECT_NEAR(x[0], this->parseNumber("1"), this->precision());
}
TYPED_TEST(MultiplierTest, repeatedMultiplyAndReduceTest) {
typedef typename TestFixture::ValueType ValueType;
storm::storage::SparseMatrixBuilder<ValueType> builder(0, 0, 0, false, true);
ASSERT_NO_THROW(builder.newRowGroup(0));
ASSERT_NO_THROW(builder.addNextValue(0, 0, this->parseNumber("0.9")));
ASSERT_NO_THROW(builder.addNextValue(0, 1, this->parseNumber("0.099")));
ASSERT_NO_THROW(builder.addNextValue(0, 2, this->parseNumber("0.001")));
ASSERT_NO_THROW(builder.addNextValue(1, 1, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.addNextValue(1, 2, this->parseNumber("0.5")));
ASSERT_NO_THROW(builder.newRowGroup(2));
ASSERT_NO_THROW(builder.addNextValue(2, 1, this->parseNumber("1")));
ASSERT_NO_THROW(builder.newRowGroup(3));
ASSERT_NO_THROW(builder.addNextValue(3, 2, this->parseNumber("1")));
storm::storage::SparseMatrix<ValueType> A;
ASSERT_NO_THROW(A = builder.build());
std::vector<ValueType> initialX = {this->parseNumber("0"), this->parseNumber("1"), this->parseNumber("0")};
std::vector<ValueType> x;
auto factory = storm::solver::MultiplierFactory<ValueType>();
auto multiplier = factory.create(this->env(), A);
x = initialX;
ASSERT_NO_THROW(multiplier->repeatedMultiplyAndReduce(this->env(), storm::OptimizationDirection::Minimize, x, nullptr, 1));
EXPECT_NEAR(x[0], this->parseNumber("0.099"), this->precision());
x = initialX;
ASSERT_NO_THROW(multiplier->repeatedMultiplyAndReduce(this->env(), storm::OptimizationDirection::Minimize, x, nullptr, 2));
EXPECT_NEAR(x[0], this->parseNumber("0.1881"), this->precision());
x = initialX;
ASSERT_NO_THROW(multiplier->repeatedMultiplyAndReduce(this->env(), storm::OptimizationDirection::Minimize, x, nullptr, 20));
EXPECT_NEAR(x[0], this->parseNumber("0.5"), this->precision());
x = initialX;
ASSERT_NO_THROW(multiplier->repeatedMultiplyAndReduce(this->env(), storm::OptimizationDirection::Maximize, x, nullptr, 1));
EXPECT_NEAR(x[0], this->parseNumber("0.5"), this->precision());
x = initialX;
ASSERT_NO_THROW(multiplier->repeatedMultiplyAndReduce(this->env(), storm::OptimizationDirection::Maximize, x, nullptr, 20));
EXPECT_NEAR(x[0], this->parseNumber("0.923808265834023387639"), this->precision());
}
}
Write Preview
Loading…
Cancel
Save