better subenvironments

src/storm/api/counterexamples.cpp

@@ -1,6 +1,6 @@
 #include "storm/api/counterexamples.h"
 
-#include "storm/environment/environments.h"
+#include "storm/environment/Environment.h"
 
 namespace storm {
     namespace api {

src/storm/environment/Environment.cpp

@@ -1,28 +1,22 @@
 #include "storm/environment/Environment.h"
+#include "storm/environment/SubEnvironment.h"
 #include "storm/environment/solver/SolverEnvironment.h"
-#include "storm/environment/solver/MinMaxSolverEnvironment.h"
-
 namespace storm {
 
 
-    Environment::Environment() : solverEnvironment(std::make_unique<SolverEnvironment>()) {
+    Environment::Environment() {
         // Intentionally left empty.
     }
     
-    Environment::Environment(Environment const& other) :
-            solverEnvironment(new SolverEnvironment(*other.solverEnvironment)) {
-        // Intentionally left empty.
-    }
-
     Environment::~Environment() {
         // Intentionally left empty.
     }
     
     SolverEnvironment& Environment::solver() {
-        return *solverEnvironment;
+        return solverEnvironment.get();
     }
     
     SolverEnvironment const& Environment::solver() const {
-        return *solverEnvironment;
+        return solverEnvironment.get();
     }
 }

src/storm/environment/Environment.h

@@ -1,10 +1,9 @@
 #pragma once
 
-#include<memory>
+#include "storm/environment/SubEnvironment.h"
 
 namespace storm {
     
-    
     // Forward declare sub-environments
     class SolverEnvironment;
     
@@ -12,8 +11,6 @@ namespace storm {
     public:
         
         Environment();
-        Environment(Environment const& other);
-        
         virtual ~Environment();
 
         SolverEnvironment& solver();
@@ -21,9 +18,7 @@ namespace storm {
         
     private:
     
-        std::unique_ptr<SolverEnvironment> solverEnvironment;
-        
-        
+        SubEnvironment<SolverEnvironment> solverEnvironment;
     };
 }
 

src/storm/environment/SubEnvironment.h

@@ -0,0 +1,38 @@
+#pragma once
+
+#include<memory>
+
+namespace storm {
+    
+    
+    template<typename EnvironmentType>
+    class SubEnvironment {
+    public:
+        
+        SubEnvironment() : subEnv(std::make_unique<EnvironmentType>()) {
+            // Intentionally left empty
+        }
+        
+        SubEnvironment(SubEnvironment const& other) : subEnv(new EnvironmentType(*other.subEnv)) {
+            // Intentionally left empty
+        }
+        
+        SubEnvironment<EnvironmentType>& operator=(SubEnvironment const& other) {
+            subEnv = std::make_unique<EnvironmentType>(*other.subEnv);
+            return *this;
+        }
+        
+        EnvironmentType const& get() const {
+            return *subEnv;
+        }
+        
+        EnvironmentType& get() {
+            return *subEnv;
+        }
+        
+    private:
+        std::unique_ptr<EnvironmentType> subEnv;
+        
+    };
+}
+

src/storm/environment/environments.h

@@ -1,6 +0,0 @@
-#pragma once
-
-#include "storm/environment/Environment.h"
-//#include "storm/environment/solver/SolverEnvironment.h"
-//#include "storm/environment/solver/MinMaxSolverEnvironment.h"
-

src/storm/environment/solver/MinMaxSolverEnvironment.h

@@ -1,5 +1,7 @@
 #pragma once
 
+#include "storm/environment/solver/SolverEnvironment.h"
+
 #include "storm/adapters/RationalNumberAdapter.h"
 #include "storm/solver/SolverSelectionOptions.h"
 #include "storm/solver/MultiplicationStyle.h"

src/storm/environment/solver/SolverEnvironment.cpp

@@ -1,19 +1,13 @@
 #include "storm/environment/solver/SolverEnvironment.h"
 #include "storm/environment/solver/MinMaxSolverEnvironment.h"
 
+#include "storm/settings/SettingsManager.h"
+#include "storm/settings/modules/GeneralSettings.h"
+
 namespace storm {
     
-    SolverEnvironment::SolverEnvironment() :
-//        eigenSolverEnvironment(std::make_unique<EigenSolverEnvironment>()),
- //       gmmxxSolverEnvironment(std::make_unique<GmmxxSolverEnvironment>()),
-        minMaxSolverEnvironment(std::make_unique<MinMaxSolverEnvironment>()) //,
-//        nativeSolverEnvironment(std::make_unique<NativeSolverEnvironment>()) {
-    { }
-    
-    SolverEnvironment::SolverEnvironment(SolverEnvironment const& other) :
-            minMaxSolverEnvironment(new MinMaxSolverEnvironment(*other.minMaxSolverEnvironment)),
-            forceSoundness(other.forceSoundness) {
-        // Intentionally left empty
+    SolverEnvironment::SolverEnvironment() {
+        forceSoundness = storm::settings::getModule<storm::settings::modules::GeneralSettings>().isSoundSet();
     }
     
     SolverEnvironment::~SolverEnvironment() {
@@ -21,11 +15,11 @@ namespace storm {
     }
     
     MinMaxSolverEnvironment& SolverEnvironment::minMax() {
-        return *minMaxSolverEnvironment;
+        return minMaxSolverEnvironment.get();
     }
     
-    MinMaxSolverEnvironment const& SolverEnvironment::minMax() const{
-        return *minMaxSolverEnvironment;
+    MinMaxSolverEnvironment const& SolverEnvironment::minMax() const {
+        return minMaxSolverEnvironment.get();
     }
 
     bool SolverEnvironment::isForceSoundness() const {

src/storm/environment/solver/SolverEnvironment.h

@@ -2,6 +2,9 @@
 
 #include<memory>
 
+#include "storm/environment/Environment.h"
+#include "storm/environment/SubEnvironment.h"
+
 namespace storm {
     
     // Forward declare subenvironments
@@ -14,7 +17,6 @@ namespace storm {
     public:
         
         SolverEnvironment();
-        SolverEnvironment(SolverEnvironment const& other);
         ~SolverEnvironment();
         
 //        EigenSolverEnvironment& eigen();
@@ -32,7 +34,7 @@ namespace storm {
     private:
 //        std::unique_ptr<EigenSolverEnvironment> eigenSolverEnvironment;
 //        std::unique_ptr<GmmxxSolverEnvironment> gmmxxSolverEnvironment;
-        std::unique_ptr<MinMaxSolverEnvironment> minMaxSolverEnvironment;
+        SubEnvironment<MinMaxSolverEnvironment> minMaxSolverEnvironment;
  //       std::unique_ptr<NativeSolverEnvironment> nativeSolverEnvironment;
       
         bool forceSoundness;

src/storm/modelchecker/AbstractModelChecker.cpp

@@ -9,7 +9,7 @@
 #include "storm/exceptions/InvalidArgumentException.h"
 #include "storm/exceptions/InternalTypeErrorException.h"
 
-#include "storm/environment/environments.h"
+#include "storm/environment/Environment.h"
 
 #include "storm/models/sparse/Dtmc.h"
 #include "storm/models/sparse/Ctmc.h"

src/storm/modelchecker/multiobjective/pcaa/SparseMdpRewardBoundedPcaaWeightVectorChecker.cpp

@@ -10,8 +10,6 @@
 #include "storm/solver/MinMaxLinearEquationSolver.h"
 #include "storm/solver/LinearEquationSolver.h"
 
-#include "storm/environment/Environment.h"
-#include "storm/environment/solver/SolverEnvironment.h"
 #include "storm/environment/solver/MinMaxSolverEnvironment.h"
 
 #include "storm/settings/SettingsManager.h"

src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp

@@ -33,8 +33,6 @@
 #include "storm/utility/ProgressMeasurement.h"
 #include "storm/utility/export.h"
 
-#include "storm/environment/Environment.h"
-#include "storm/environment/solver/SolverEnvironment.h"
 #include "storm/environment/solver/MinMaxSolverEnvironment.h"
 
 #include "storm/exceptions/InvalidStateException.h"

src/storm/solver/IterativeMinMaxLinearEquationSolver.cpp

@@ -2,8 +2,6 @@
 
 #include "storm/utility/ConstantsComparator.h"
 
-#include "storm/environment/Environment.h"
-#include "storm/environment/solver/SolverEnvironment.h"
 #include "storm/environment/solver/MinMaxSolverEnvironment.h"
 
 #include "storm/utility/KwekMehlhorn.h"

src/storm/solver/LpMinMaxLinearEquationSolver.cpp

@@ -1,7 +1,5 @@
 #include "storm/solver/LpMinMaxLinearEquationSolver.h"
 
-#include "storm/environment/Environment.h"
-#include "storm/environment/solver/SolverEnvironment.h"
 #include "storm/environment/solver/MinMaxSolverEnvironment.h"
 #include "storm/utility/vector.h"
 #include "storm/utility/macros.h"

src/storm/solver/MinMaxLinearEquationSolver.cpp

@@ -7,8 +7,6 @@
 #include "storm/solver/TopologicalMinMaxLinearEquationSolver.h"
 #include "storm/solver/LpMinMaxLinearEquationSolver.h"
 
-#include "storm/environment/Environment.h"
-#include "storm/environment/solver/SolverEnvironment.h"
 #include "storm/environment/solver/MinMaxSolverEnvironment.h"
 
 #include "storm/utility/macros.h"

src/storm/solver/StandardMinMaxLinearEquationSolver.cpp

@@ -6,8 +6,6 @@
 #include "storm/solver/NativeLinearEquationSolver.h"
 #include "storm/solver/EliminationLinearEquationSolver.h"
 
-#include "storm/environment/Environment.h"
-#include "storm/environment/solver/SolverEnvironment.h"
 #include "storm/environment/solver/MinMaxSolverEnvironment.h"
 
 #include "storm/utility/vector.h"

src/storm/solver/SymbolicMinMaxLinearEquationSolver.cpp

@@ -7,8 +7,6 @@
 
 #include "storm/utility/constants.h"
 
-#include "storm/environment/Environment.h"
-#include "storm/environment/solver/SolverEnvironment.h"
 #include "storm/environment/solver/MinMaxSolverEnvironment.h"
 
 #include "storm/utility/dd.h"

src/storm/solver/TopologicalMinMaxLinearEquationSolver.cpp

@@ -7,8 +7,6 @@
 #include "storm/exceptions/InvalidStateException.h"
 #include "storm/exceptions/InvalidEnvironmentException.h"
 
-#include "storm/environment/Environment.h"
-#include "storm/environment/solver/SolverEnvironment.h"
 #include "storm/environment/solver/MinMaxSolverEnvironment.h"
 
 #include "storm/settings/SettingsManager.h"