Break inclusion loop in DFT.h

and comment magic numbers in RelevantEvents.h

src/storm-dft/storage/dft/DFT.cpp

@@ -10,6 +10,7 @@
 
 #include "storm-dft/builder/DFTBuilder.h"
 #include "storm-dft/storage/dft/DFTIsomorphism.h"
+#include "storm-dft/utility/RelevantEvents.h"
 
 
 namespace storm {

src/storm-dft/storage/dft/DFT.h

@@ -17,13 +17,15 @@
 #include "storm-dft/storage/dft/SymmetricUnits.h"
 #include "storm-dft/storage/dft/DFTStateGenerationInfo.h"
 #include "storm-dft/storage/dft/DFTLayoutInfo.h"
-#include "storm-dft/utility/RelevantEvents.h"
 
 namespace storm {
+    // Forward declarations
     namespace builder {
-        // Forward declaration
         template<typename T> class DFTBuilder;
     }
+    namespace utility {
+        class RelevantEvents;
+    }
 
     namespace storage {
 

src/storm-dft/utility/RelevantEvents.h

@@ -57,8 +57,10 @@ namespace storm {
                     } else {
                         // Get name of event
                         if (boost::ends_with(label, "_failed")) {
+                            // length of "_failed" = 7
                             this->addEvent(label.substr(0, label.size() - 7));
                         } else if (boost::ends_with(label, "_dc")) {
+                            // length of "_dc" = 3
                             this->addEvent(label.substr(0, label.size() - 3));
                         } else if (label.find("_claimed_") != std::string::npos) {
                             STORM_LOG_THROW(storm::settings::getModule<storm::settings::modules::FaultTreeSettings>().isAddLabelsClaiming(), storm::exceptions::InvalidArgumentException, "Claiming labels will not be exported but are required for label '" << label << "'. Try setting --labels-claiming.");