From ed526f2e0a85b102928cbc192f2b1b7dba1c9adc Mon Sep 17 00:00:00 2001
From: Mavo <matthias.volk@rwth-aachen.de>
Date: Tue, 19 Jan 2016 16:12:41 +0100
Subject: [PATCH] Initialized settings in build model
Former-commit-id: 09d219a8c690c2e69fa4fbc13834c4711faee812
---
src/python/storm-core.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/python/storm-core.cpp b/src/python/storm-core.cpp
index 3d7b00404..b7ecebbd6 100644
--- a/src/python/storm-core.cpp
+++ b/src/python/storm-core.cpp
@@ -26,6 +26,7 @@ namespace boost { namespace python { namespace converter {
std::shared_ptr<storm::models::ModelBase> buildModel(storm::prism::Program const& program, std::shared_ptr<storm::logic::Formula> const& formula) {
+ storm::settings::SettingsManager::manager().setFromString("");
return storm::buildSymbolicModel<storm::RationalFunction>(program, std::vector<std::shared_ptr<storm::logic::Formula>>(1,formula)).model;
}
@@ -45,6 +46,7 @@ BOOST_PYTHON_MODULE(_core)
class_<storm::logic::ProbabilityOperatorFormula, std::shared_ptr<storm::logic::ProbabilityOperatorFormula>, bases<storm::logic::Formula>>("ProbabilityOperatorFormula", no_init)
.def("toString", &storm::logic::ProbabilityOperatorFormula::toString);
+ register_ptr_to_python<std::shared_ptr<storm::logic::Formula>>();
////////////////////////////////////////////
// Program
@@ -82,7 +84,9 @@ BOOST_PYTHON_MODULE(_core)
class_<storm::models::sparse::Model<double>, std::shared_ptr<storm::models::sparse::Model<double>>, boost::noncopyable, bases<storm::models::ModelBase>>("SparseModel", no_init);
class_<storm::models::sparse::Dtmc<storm::RationalFunction>, std::shared_ptr<storm::models::sparse::Dtmc<storm::RationalFunction>>, boost::noncopyable, bases<storm::models::ModelBase>>("SparseParamtricMc", no_init);
-
+ register_ptr_to_python<std::shared_ptr<storm::models::ModelBase>>();
+ register_ptr_to_python<std::shared_ptr<storm::models::sparse::Model<storm::RationalFunction>>>();
+ register_ptr_to_python<std::shared_ptr<storm::models::sparse::Dtmc<storm::RationalFunction>>>();
def("parseFormulae", storm::parseFormulasForProgram);
def("parseProgram", storm::parseProgram);
@@ -102,4 +106,4 @@ BOOST_PYTHON_MODULE(_core)
def("performStateElimination", storm::verifySparseModel<storm::RationalFunction>);
-}
\ No newline at end of file
+}