storm-dft running again

src/storm-dft-cli/storm-dyftee.cpp

@@ -8,11 +8,10 @@
 #include "storm/cli/cli.h"
 #include "storm/exceptions/BaseException.h"
 #include "storm/utility/macros.h"
-#include "storm-dft/builder/DftSmtBuilder.h"
 
 
 #include "storm/settings/modules/GeneralSettings.h"
-#include "storm/settings/modules/DFTSettings.h"
+#include "storm-dft/settings/modules/DFTSettings.h"
 #include "storm/settings/modules/CoreSettings.h"
 #include "storm/settings/modules/DebugSettings.h"
 //#include "storm/settings/modules/CounterexampleGeneratorSettings.h"

src/storm-dft/modelchecker/dft/DFTModelChecker.cpp

@@ -1,12 +1,12 @@
 #include "DFTModelChecker.h"
 
 #include "storm/builder/ParallelCompositionBuilder.h"
-#include "storm/settings/modules/DFTSettings.h"
 #include "storm/utility/bitoperations.h"
 
 #include "storm-dft/builder/ExplicitDFTModelBuilder.h"
 #include "storm-dft/builder/ExplicitDFTModelBuilderApprox.h"
 #include "storm-dft/storage/dft/DFTIsomorphism.h"
+#include "storm-dft/settings/modules/DFTSettings.h"
 
 namespace storm {
     namespace modelchecker {

src/storm-dft-cli/settings/modules/DFTSettings.cpp → src/storm-dft/settings/modules/DFTSettings.cpp

@@ -1,4 +1,4 @@
-#include "storm/settings/modules/DFTSettings.h"
+#include "DFTSettings.h"
 
 #include "storm/settings/SettingsManager.h"
 #include "storm/settings/SettingMemento.h"

src/storm-dft-cli/settings/modules/DFTSettings.h → src/storm-dft/settings/modules/DFTSettings.h

@@ -1,9 +1,9 @@
-#ifndef STORM_SETTINGS_MODULES_DFTSETTINGS_H_
-#define STORM_SETTINGS_MODULES_DFTSETTINGS_H_
+#pragma once
 
 #include "storm-config.h"
 #include "storm/settings/modules/ModuleSettings.h"
-#include "storm/builder/DftExplorationHeuristic.h"
+
+#include "storm-dft/builder/DftExplorationHeuristic.h"
 
 namespace storm {
     namespace settings {
@@ -167,5 +167,3 @@ namespace storm {
         } // namespace modules
     } // namespace settings
 } // namespace storm
-
-#endif /* STORM_SETTINGS_MODULES_DFTSETTINGS_H_ */