made move of top-level dir for some remaining files, fixed some includes

resources/3rdparty/sylvan/src/storm_function_wrapper.cpp

@@ -5,7 +5,7 @@
 #include <sstream>
 #include <set>
 #include <map>
-#include "src/adapters/CarlAdapter.h"
+#include "storm/adapters/CarlAdapter.h"
 #include "sylvan_storm_rational_function.h"
 
 #include <sylvan_config.h>

resources/3rdparty/sylvan/src/sylvan_obj.hpp

@@ -23,7 +23,7 @@
 #include <lace.h>
 #include <sylvan.h>
 
-#include "src/adapters/CarlAdapter.h"
+#include "storm/adapters/CarlAdapter.h"
 
 namespace sylvan {
 

src/storm/adapters/AddExpressionAdapter.cpp

@@ -9,7 +9,7 @@
 #include "storm/storage/dd/Bdd.h"
 
 #include "storm-config.h"
-#include "src/adapters/CarlAdapter.h"
+#include "storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace adapters {

src/storm/builder/DdJaniModelBuilder.cpp

@@ -128,20 +128,6 @@ namespace storm {
         }
         
         template <storm::dd::DdType Type, typename ValueType>
-        DdJaniModelBuilder<Type, ValueType>::DdJaniModelBuilder(storm::jani::Model const& model, Options const& options) : model(model), options(options) {
-            if (this->model->hasUndefinedConstants()) {
-                std::vector<std::reference_wrapper<storm::jani::Constant const>> undefinedConstants = this->model->getUndefinedConstants();
-                std::vector<std::string> strings;
-                for (auto const& constant : undefinedConstants) {
-                    std::stringstream stream;
-                    stream << constant.get().getName() << " (" << constant.get().getType() << ")";
-                    strings.push_back(stream.str());
-                }
-                STORM_LOG_THROW(false, storm::exceptions::InvalidArgumentException, "Model still contains these undefined constants: " << boost::join(strings, ", ") << ".");
-            }
-            
-            this->model = this->model->substituteConstants();
-
         std::set<std::string> const& DdJaniModelBuilder<Type, ValueType>::Options::getRewardModelNames() const {
             return rewardModelsToBuild;
         }

src/storm/builder/DdJaniModelBuilder.h

@@ -102,7 +102,7 @@ namespace storm {
                 // model. If this is set, the outgoing transitions of these states are replaced with a self-loop.
                 boost::optional<storm::expressions::Expression> negatedTerminalStates;
             };
-            
+                        
             /*!
              * Translates the given program into a symbolic model (i.e. one that stores the transition relation as a
              * decision diagram).

src/storm/storage/dd/Add.h

@@ -15,7 +15,7 @@
 #include "storm/storage/dd/sylvan/SylvanAddIterator.h"
 
 #include "storm-config.h"
-#include "src/adapters/CarlAdapter.h"
+#include "storm/adapters/CarlAdapter.h"
 
 namespace storm {
     namespace dd {

src/storm/storage/dd/Bdd.h

@@ -369,7 +369,6 @@ namespace storm {
     }
 }
 
-<<<<<<< HEAD:src/storage/dd/Bdd.h
 namespace std {
     template<storm::dd::DdType LibraryType>
     struct hash<storm::dd::Bdd<LibraryType>> {
@@ -380,6 +379,3 @@ namespace std {
 }
 
 #endif /* STORM_STORAGE_DD_BDD_H_ */
-=======
-#endif /* STORM_STORAGE_DD_BDD_H_ */
->>>>>>> master:src/storm/storage/dd/Bdd.h

src/storm/storage/dd/sylvan/InternalSylvanAdd.h

@@ -13,7 +13,7 @@
 
 #include "storm/storage/expressions/Variable.h"
 
-#include "src/adapters/CarlAdapter.h"
+#include "storm/adapters/CarlAdapter.h"
 #include "storm-config.h"
 
 namespace storm {