From 4081e4bfbe8a6a21fcc53e4bad7d506cafaa43ef Mon Sep 17 00:00:00 2001
From: TimQu <tim.quatmann@cs.rwth-aachen.de>
Date: Fri, 17 Feb 2017 11:39:10 +0100
Subject: [PATCH] removed debug output and fixed a test

---
 .../modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp | 3 +--
 src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp | 2 --
 .../multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp      | 2 --
 src/test/modelchecker/SparseMdpPcaaModelCheckerTest.cpp        | 2 +-
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp
index 072ef3e73..9caf36d04 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaParetoQuery.cpp
@@ -80,8 +80,7 @@ namespace storm {
                         // Goal precision reached!
                         return;
                     }
-                    STORM_LOG_DEBUG("Current precision of the approximation of the pareto curve is ~" << storm::utility::convertNumber<double>(farestDistance));
-                    std::cout << "Current precision of the approximation of the pareto curve is ~" << storm::utility::convertNumber<double>(farestDistance) << std::endl;
+                    STORM_LOG_INFO("Current precision of the approximation of the pareto curve is ~" << storm::utility::convertNumber<double>(farestDistance));
                     WeightVector direction = underApproxHalfspaces[farestHalfspaceIndex].normalVector();
                     this->performRefinementStep(std::move(direction));
                 }
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp
index 42bd16b9a..5bc096c93 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp
@@ -121,7 +121,6 @@ namespace storm {
                 }
                 overApproximation = overApproximation->intersection(h);
                 STORM_LOG_DEBUG("Updated OverApproximation to " << overApproximation->toString(true));
-                std::cout << "Updated OverApproximation to " << overApproximation->toString(true) << std::endl;
             }
             
             template <class SparseModelType, typename GeometryValueType>
@@ -133,7 +132,6 @@ namespace storm {
                 }
                 underApproximation = storm::storage::geometry::Polytope<GeometryValueType>::createDownwardClosure(paretoPoints);
                 STORM_LOG_DEBUG("Updated UnderApproximation to " << underApproximation->toString(true));
-                std::cout << "Updated UnderApproximation to " << underApproximation->toString(true) << std::endl;
             }
             
             template <class SparseModelType, typename GeometryValueType>
diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp
index fb5c2e6b6..d93cedab8 100644
--- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp
+++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaWeightVectorChecker.cpp
@@ -146,9 +146,7 @@ namespace storm {
                 std::unique_ptr<storm::solver::MinMaxLinearEquationSolver<ValueType>> solver = solverFactory.create(ecEliminatorResult.matrix);
                 solver->setOptimizationDirection(storm::solver::OptimizationDirection::Maximize);
                 solver->setTrackScheduler(true);
-                std::cout << "invoked minmaxsolver" << std::endl;
                 solver->solveEquations(subResult, subRewardVector);
-                std::cout << "minmaxsolver done" << std::endl;
 
                 this->weightedResult = std::vector<ValueType>(model.getNumberOfStates());
                 std::vector<uint_fast64_t> optimalChoices(model.getNumberOfStates());
diff --git a/src/test/modelchecker/SparseMdpPcaaModelCheckerTest.cpp b/src/test/modelchecker/SparseMdpPcaaModelCheckerTest.cpp
index 52960434d..369a768ac 100644
--- a/src/test/modelchecker/SparseMdpPcaaModelCheckerTest.cpp
+++ b/src/test/modelchecker/SparseMdpPcaaModelCheckerTest.cpp
@@ -104,7 +104,7 @@ TEST(SparseMdpPcaaModelCheckerTest, dpm) {
     
     std::unique_ptr<storm::modelchecker::CheckResult> result = storm::modelchecker::multiobjective::performPcaa(*mdp, formulas[0]->asMultiObjectiveFormula());
     ASSERT_TRUE(result->isExplicitQuantitativeCheckResult());
-    EXPECT_NEAR(121.61288, result->asExplicitQuantitativeCheckResult<double>()[initState], storm::settings::getModule<storm::settings::modules::GeneralSettings>().getPrecision());
+    EXPECT_NEAR(121.6128842, result->asExplicitQuantitativeCheckResult<double>()[initState], storm::settings::getModule<storm::settings::modules::GeneralSettings>().getPrecision());
 }