From 8e07f5855de31105f2540b22ba0e2ef6577bf0ec Mon Sep 17 00:00:00 2001 From: sjunges Date: Mon, 25 Jan 2016 16:50:30 +0100 Subject: [PATCH] shared stormlib, added variables from model Former-commit-id: 6c4374f76f8720b735e449b5e193966d4334aaa0 --- src/CMakeLists.txt | 2 +- src/python/storm-core.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1cf04da10..874eee2dc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -108,7 +108,7 @@ endif(ADDITIONAL_LINK_DIRS) ## All link_directories() calls MUST be made before this point # ## # ############################################################################### -add_library(storm ${STORM_LIB_SOURCES} ${STORM_LIB_HEADERS} ${STORM_GENERATED_SOURCES}) # Adding headers for xcode +add_library(storm SHARED ${STORM_LIB_SOURCES} ${STORM_LIB_HEADERS} ${STORM_GENERATED_SOURCES}) # Adding headers for xcode add_dependencies(storm xercesc) add_dependencies(storm sylvan) add_executable(storm-main ${STORM_MAIN_SOURCES} ${STORM_MAIN_HEADERS}) diff --git a/src/python/storm-core.cpp b/src/python/storm-core.cpp index 6a35d6b32..c74323b4b 100644 --- a/src/python/storm-core.cpp +++ b/src/python/storm-core.cpp @@ -85,11 +85,14 @@ BOOST_PYTHON_MODULE(_core) ; - defineClass, storm::models::ModelBase, boost::noncopyable>("SparseModel", ""); + defineClass, storm::models::ModelBase, boost::noncopyable>("SparseModel", + "A probabilistic model where transitions are represented by doubles and saved in a sparse matrix"); defineClass, storm::models::sparse::Model, boost::noncopyable>("SparseDtmc", ""); defineClass, storm::models::sparse::Model>("SparseMdp", ""); - defineClass, storm::models::ModelBase, boost::noncopyable>("SparseParametricModel", ""); + defineClass, storm::models::ModelBase, boost::noncopyable>("SparseParametricModel", "") + .def("collect_probability_parameters", &storm::models::sparse::getProbabilityParameters) + ; defineClass, storm::models::sparse::Model>("SparseParametricDtmc", ""); defineClass, storm::models::sparse::Model>("SparseParametricMdp", "");