fixed tests: glpk had wrong minimize, solver.cpp tested in wrong direction on policy iteration in case we use top. value iteration

Former-commit-id: 71215b8e46

src/utility/solver.cpp

@@ -87,6 +87,7 @@ namespace storm {
             {
                 prefTech = storm::solver::MinMaxTechniqueSelection::FROMSETTINGS;
                 setSolverType(solver);
+                std::cout << toString(prefTech) << std::endl;
             }
             
             template<typename ValueType>
@@ -107,6 +108,7 @@ namespace storm {
             template<typename ValueType>
             std::unique_ptr<storm::solver::MinMaxLinearEquationSolver<ValueType>> MinMaxLinearEquationSolverFactory<ValueType>::create(storm::storage::SparseMatrix<ValueType> const& matrix, bool trackPolicy) const {
                 
+                std::cout << toString(prefTech) << std::endl;
                 std::unique_ptr<storm::solver::MinMaxLinearEquationSolver<ValueType>> p1;
                 
                 switch (solverType) {
@@ -122,7 +124,7 @@ namespace storm {
                     }
                     case storm::solver::EquationSolverType::Topological:
                     {
-                        STORM_LOG_THROW(prefTech == storm::solver::MinMaxTechniqueSelection::PolicyIteration, storm::exceptions::NotImplementedException, "Policy iteration for topological solver is not supported.");
+                        STORM_LOG_THROW(prefTech != storm::solver::MinMaxTechniqueSelection::PolicyIteration, storm::exceptions::NotImplementedException, "Policy iteration for topological solver is not supported.");
                         p1.reset(new storm::solver::TopologicalMinMaxLinearEquationSolver<ValueType>(matrix));
                         break;
                     }

test/functional/solver/GlpkLpSolverTest.cpp

@@ -14,7 +14,7 @@
 #include "src/solver/OptimizationDirection.h"
 
 TEST(GlpkLpSolver, LPOptimizeMax) {
-    storm::solver::GlpkLpSolver solver(storm::OptimizationDirection::Minimize);
+    storm::solver::GlpkLpSolver solver(storm::OptimizationDirection::Maximize);
     storm::expressions::Variable x;
     storm::expressions::Variable y;
     storm::expressions::Variable z;