storm pars result moved from storm to storm pars

src/storm-pars/api/export.h

@@ -0,0 +1,34 @@
+#include "storm/utility/file.h"
+#include "storm/utility/macros.h"
+#include "storm/exceptions/NotSupportedException.h"
+#include "storm/analysis/GraphConditions.h"
+
+namespace storm {
+    namespace api {
+
+        template <typename ValueType>
+        void exportParametricResultToFile(ValueType const& result, storm::analysis::ConstraintCollector<ValueType> const& constraintCollector, std::string const& path) {
+            STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Cannot export non-parametric result.");
+        }
+
+        template <>
+        inline void exportParametricResultToFile(storm::RationalFunction const& result, storm::analysis::ConstraintCollector<storm::RationalFunction> const& constraintCollector, std::string const& path) {
+            std::ofstream filestream;
+            storm::utility::openFile(path, filestream);
+            filestream << "$Parameters: ";
+            std::set<storm::RationalFunctionVariable> vars = result.gatherVariables();
+            std::copy(vars.begin(), vars.end(), std::ostream_iterator<storm::RationalFunctionVariable>(filestream, "; "));
+            filestream << std::endl;
+            filestream << "$Result: " << result.toString(false, true) << std::endl;
+            filestream << "$Well-formed Constraints: " << std::endl;
+            std::vector<std::string> stringConstraints;
+            std::transform(constraintCollector.getWellformedConstraints().begin(), constraintCollector.getWellformedConstraints().end(), std::back_inserter(stringConstraints), [](carl::Formula<typename storm::Polynomial::PolyType> const& c) ->  std::string { return c.toString();});
+            std::copy(stringConstraints.begin(), stringConstraints.end(), std::ostream_iterator<std::string>(filestream, "\n"));
+            filestream << "$Graph-preserving Constraints: " << std::endl;
+            stringConstraints.clear();
+            std::transform(constraintCollector.getGraphPreservingConstraints().begin(), constraintCollector.getGraphPreservingConstraints().end(), std::back_inserter(stringConstraints), [](carl::Formula<typename storm::Polynomial::PolyType> const& c) ->  std::string { return c.toString();});
+            std::copy(stringConstraints.begin(), stringConstraints.end(), std::ostream_iterator<std::string>(filestream, "\n"));
+            storm::utility::closeFile(filestream);
+        }
+    }
+}

src/storm-pars/api/storm-pars.h

@@ -1,3 +1,4 @@
 #pragma once
 
 #include "storm-pars/api/region.h"
+#include "storm-pars/api/export.h"

src/storm/api/export.h

@@ -2,7 +2,6 @@
 
 #include "storm/storage/jani/JSONExporter.h"
 
-#include "storm/analysis/GraphConditions.h"
 
 #include "storm/settings/SettingsManager.h"
 #include "storm/settings/modules/JaniExportSettings.h"
@@ -10,7 +9,6 @@
 #include "storm/utility/DirectEncodingExporter.h"
 #include "storm/utility/file.h"
 #include "storm/utility/macros.h"
-#include "storm/exceptions/NotSupportedException.h"
 
 namespace storm {
     namespace api {
@@ -19,31 +17,6 @@ namespace storm {
         
         void exportJaniModelAsDot(storm::jani::Model const& model, std::string const& filename);
 
-        template <typename ValueType>
-        void exportParametricResultToFile(ValueType const& result, storm::analysis::ConstraintCollector<ValueType> const& constraintCollector, std::string const& path) {
-            STORM_LOG_THROW(false, storm::exceptions::NotSupportedException, "Cannot export non-parametric result.");
-        }
-        
-        template <>
-        inline void exportParametricResultToFile(storm::RationalFunction const& result, storm::analysis::ConstraintCollector<storm::RationalFunction> const& constraintCollector, std::string const& path) {
-            std::ofstream filestream;
-            storm::utility::openFile(path, filestream);
-            filestream << "!Parameters: ";
-            std::set<storm::RationalFunctionVariable> vars = result.gatherVariables();
-            std::copy(vars.begin(), vars.end(), std::ostream_iterator<storm::RationalFunctionVariable>(filestream, "; "));
-            filestream << std::endl;
-            filestream << "!Result: " << result.toString(false, true) << std::endl;
-            filestream << "!Well-formed Constraints: " << std::endl;
-            std::vector<std::string> stringConstraints;
-            std::transform(constraintCollector.getWellformedConstraints().begin(), constraintCollector.getWellformedConstraints().end(), std::back_inserter(stringConstraints), [](carl::Formula<typename storm::Polynomial::PolyType> const& c) ->  std::string { return c.toString();});
-            std::copy(stringConstraints.begin(), stringConstraints.end(), std::ostream_iterator<std::string>(filestream, "\n"));
-            filestream << "!Graph-preserving Constraints: " << std::endl;
-            stringConstraints.clear();
-            std::transform(constraintCollector.getGraphPreservingConstraints().begin(), constraintCollector.getGraphPreservingConstraints().end(), std::back_inserter(stringConstraints), [](carl::Formula<typename storm::Polynomial::PolyType> const& c) ->  std::string { return c.toString();});
-            std::copy(stringConstraints.begin(), stringConstraints.end(), std::ostream_iterator<std::string>(filestream, "\n"));
-            storm::utility::closeFile(filestream);
-        }
-        
         template <typename ValueType>
         void exportSparseModelAsDrn(std::shared_ptr<storm::models::sparse::Model<ValueType>> const& model, std::string const& filename, std::vector<std::string> const& parameterNames) {
             std::ofstream stream;

src/storm/utility/export.h

@@ -1,10 +1,3 @@
-/** 
- * @file:   export.h
- * @author: Sebastian Junges
- *
- * @since October 7, 2014
- */
-
 #ifndef STORM_UTILITY_EXPORT_H_
 #define STORM_UTILITY_EXPORT_H_
 
@@ -14,32 +7,12 @@
 #include "storm/utility/macros.h"
 #include "storm/utility/file.h"
 
-//#include "storm/storage/parameters.h"
-//#include "storm/settings/modules/ParametricSettings.h"
-//#include "storm/modelchecker/reachability/CollectConstraints.h"
+
 
 namespace storm {
     namespace utility {
 
-            /* TODO Fix me
-        template<typename ValueType>	
-        void exportParametricMcResult(const ValueType& mcresult, storm::modelchecker::reachability::CollectConstraints<storm::RationalFunction> const& constraintCollector) {
-            std::string path = storm::settings::getModule<storm::settings::modules::ParametricSettings>().exportResultPath();
-            std::ofstream filestream;
-            filestream.open(path);
-            // todo add checks.
-            filestream << "!Parameters: ";
-            std::set<storm::RationalFunctionVariable> vars = mcresult.gatherVariables();
-            std::copy(vars.begin(), vars.end(), std::ostream_iterator<storm::RationalFunctionVariable>(filestream, ", "));
-            filestream << std::endl;
-            filestream << "!Result: " << mcresult << std::endl;
-            filestream << "!Well-formed Constraints: " << std::endl;
-            std::copy(constraintCollector.wellformedConstraints().begin(), constraintCollector.wellformedConstraints().end(), std::ostream_iterator<carl::Constraint<ValueType>>(filestream, "\n"));
-            filestream << "!Graph-preserving Constraints: " << std::endl;
-            std::copy(constraintCollector.graphPreservingConstraints().begin(), constraintCollector.graphPreservingConstraints().end(), std::ostream_iterator<carl::Constraint<ValueType>>(filestream, "\n"));
-            filestream.close();
-        }
-        */
+
         
         template <typename ValueType>
         inline void exportDataToCSVFile(std::string filepath, std::vector<std::vector<ValueType>> const& data, boost::optional<std::vector<std::string>> const& columnHeaders) {