From 82a740a74eae3bb753929596b3d3a2afc00110fd Mon Sep 17 00:00:00 2001
From: Sebastian Junges <sebastian.junges@rwth-aachen.de>
Date: Fri, 25 Nov 2016 11:27:25 +0100
Subject: [PATCH] storm-dft running again

---
 src/storm-dft-cli/storm-dyftee.cpp                        | 3 +--
 src/storm-dft/modelchecker/dft/DFTModelChecker.cpp        | 2 +-
 .../settings/modules/DFTSettings.cpp                      | 2 +-
 .../settings/modules/DFTSettings.h                        | 8 +++-----
 4 files changed, 6 insertions(+), 9 deletions(-)
 rename src/{storm-dft-cli => storm-dft}/settings/modules/DFTSettings.cpp (99%)
 rename src/{storm-dft-cli => storm-dft}/settings/modules/DFTSettings.h (96%)

diff --git a/src/storm-dft-cli/storm-dyftee.cpp b/src/storm-dft-cli/storm-dyftee.cpp
index 03aa1cab8..fe5c1ad47 100644
--- a/src/storm-dft-cli/storm-dyftee.cpp
+++ b/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"
diff --git a/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp b/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp
index 584d1edca..ae4144ee7 100644
--- a/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp
+++ b/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 {
diff --git a/src/storm-dft-cli/settings/modules/DFTSettings.cpp b/src/storm-dft/settings/modules/DFTSettings.cpp
similarity index 99%
rename from src/storm-dft-cli/settings/modules/DFTSettings.cpp
rename to src/storm-dft/settings/modules/DFTSettings.cpp
index 359bab023..5bf705d8a 100644
--- a/src/storm-dft-cli/settings/modules/DFTSettings.cpp
+++ b/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"
diff --git a/src/storm-dft-cli/settings/modules/DFTSettings.h b/src/storm-dft/settings/modules/DFTSettings.h
similarity index 96%
rename from src/storm-dft-cli/settings/modules/DFTSettings.h
rename to src/storm-dft/settings/modules/DFTSettings.h
index e18d626ca..1b1b097f9 100644
--- a/src/storm-dft-cli/settings/modules/DFTSettings.h
+++ b/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_ */