Update changed namespaces in Storm (#197)

---------

Co-authored-by: Matthias Volk <[email protected]>

Author: TheGreatfpmK

src/core/core.cpp

@@ -3,6 +3,7 @@
 #include "core.h"
 #include "storm/utility/initialize.h"
 #include "storm/utility/SignalHandler.h"
+#include "storm/io/file.h"
 #include "storm/io/DirectEncodingExporter.h"
 #include "storm/storage/ModelFormulasPair.h"
 #include "storm/storage/dd/DdType.h"
@@ -179,21 +180,21 @@ void define_optimality_type(py::module& m) {
 
 // Thin wrapper for exporting model
 template<typename ValueType>
-void exportDRN(std::shared_ptr<storm::models::sparse::Model<ValueType>> model, std::string const& file, storm::exporter::DirectEncodingOptions options) {
+void exportDRN(std::shared_ptr<storm::models::sparse::Model<ValueType>> model, std::string const& file, storm::io::DirectEncodingOptions options) {
     std::ofstream stream;
-    storm::utility::openFile(file, stream);
-    storm::exporter::explicitExportSparseModel(stream, model, {}, options);
-    storm::utility::closeFile(stream);
+    storm::io::openFile(file, stream);
+    storm::io::explicitExportSparseModel(stream, model, {}, options);
+    storm::io::closeFile(stream);
 }
 
 void define_export(py::module& m) {
 
-    py::class_<storm::exporter::DirectEncodingOptions> opts(m, "DirectEncodingOptions");
+    py::class_<storm::io::DirectEncodingOptions> opts(m, "DirectEncodingOptions");
     opts.def(py::init<>());
-    opts.def_readwrite("allow_placeholders", &storm::exporter::DirectEncodingOptions::allowPlaceholders);
+    opts.def_readwrite("allow_placeholders", &storm::io::DirectEncodingOptions::allowPlaceholders);
     // Export
-    m.def("_export_to_drn", &exportDRN<double>, "Export model in DRN format", py::arg("model"), py::arg("file"), py::arg("options")=storm::exporter::DirectEncodingOptions());
-    m.def("_export_to_drn_interval", &exportDRN<storm::Interval>, "Export model in DRN format", py::arg("model"), py::arg("file"), py::arg("options")=storm::exporter::DirectEncodingOptions());
-    m.def("_export_exact_to_drn", &exportDRN<storm::RationalNumber>, "Export model in DRN format", py::arg("model"), py::arg("file"), py::arg("options")=storm::exporter::DirectEncodingOptions());
-    m.def("_export_parametric_to_drn", &exportDRN<storm::RationalFunction>, "Export parametric model in DRN format", py::arg("model"), py::arg("file"), py::arg("options")=storm::exporter::DirectEncodingOptions());
+    m.def("_export_to_drn", &exportDRN<double>, "Export model in DRN format", py::arg("model"), py::arg("file"), py::arg("options")=storm::io::DirectEncodingOptions());
+    m.def("_export_to_drn_interval", &exportDRN<storm::Interval>, "Export model in DRN format", py::arg("model"), py::arg("file"), py::arg("options")=storm::io::DirectEncodingOptions());
+    m.def("_export_exact_to_drn", &exportDRN<storm::RationalNumber>, "Export model in DRN format", py::arg("model"), py::arg("file"), py::arg("options")=storm::io::DirectEncodingOptions());
+    m.def("_export_parametric_to_drn", &exportDRN<storm::RationalFunction>, "Export parametric model in DRN format", py::arg("model"), py::arg("file"), py::arg("options")=storm::io::DirectEncodingOptions());
 }

src/gspn/gspn.cpp

@@ -17,15 +17,15 @@ using TransitionPartition = storm::gspn::TransitionPartition;
 
 void gspnToFile(GSPN const& gspn, std::string const& filepath, bool toPnpro) {
     std::ofstream fs;
-    storm::utility::openFile(filepath, fs);
+    storm::io::openFile(filepath, fs);
 
     if(toPnpro) {
         gspn.toPnpro(fs);
     }
     else {
         gspn.toPnml(fs);
     }
-    storm::utility::closeFile(fs);
+    storm::io::closeFile(fs);
 }