Browse Source

shared stormlib, added variables from model

Former-commit-id: 6c4374f76f
tempestpy_adaptions
sjunges 9 years ago
parent
commit
8e07f5855d
  1. 2
      src/CMakeLists.txt
  2. 7
      src/python/storm-core.cpp

2
src/CMakeLists.txt

@ -108,7 +108,7 @@ endif(ADDITIONAL_LINK_DIRS)
## All link_directories() calls MUST be made before this point # ## 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 xercesc)
add_dependencies(storm sylvan) add_dependencies(storm sylvan)
add_executable(storm-main ${STORM_MAIN_SOURCES} ${STORM_MAIN_HEADERS}) add_executable(storm-main ${STORM_MAIN_SOURCES} ${STORM_MAIN_HEADERS})

7
src/python/storm-core.cpp

@ -85,11 +85,14 @@ BOOST_PYTHON_MODULE(_core)
; ;
defineClass<storm::models::sparse::Model<double>, storm::models::ModelBase, boost::noncopyable>("SparseModel", "");
defineClass<storm::models::sparse::Model<double>, 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::Dtmc<double>, storm::models::sparse::Model<double>, boost::noncopyable>("SparseDtmc", ""); defineClass<storm::models::sparse::Dtmc<double>, storm::models::sparse::Model<double>, boost::noncopyable>("SparseDtmc", "");
defineClass<storm::models::sparse::Mdp<double>, storm::models::sparse::Model<double>>("SparseMdp", ""); defineClass<storm::models::sparse::Mdp<double>, storm::models::sparse::Model<double>>("SparseMdp", "");
defineClass<storm::models::sparse::Model<storm::RationalFunction>, storm::models::ModelBase, boost::noncopyable>("SparseParametricModel", "");
defineClass<storm::models::sparse::Model<storm::RationalFunction>, storm::models::ModelBase, boost::noncopyable>("SparseParametricModel", "")
.def("collect_probability_parameters", &storm::models::sparse::getProbabilityParameters)
;
defineClass<storm::models::sparse::Dtmc<storm::RationalFunction>, storm::models::sparse::Model<storm::RationalFunction>>("SparseParametricDtmc", ""); defineClass<storm::models::sparse::Dtmc<storm::RationalFunction>, storm::models::sparse::Model<storm::RationalFunction>>("SparseParametricDtmc", "");
defineClass<storm::models::sparse::Mdp<storm::RationalFunction>, storm::models::sparse::Model<storm::RationalFunction>>("SparseParametricMdp", ""); defineClass<storm::models::sparse::Mdp<storm::RationalFunction>, storm::models::sparse::Model<storm::RationalFunction>>("SparseParametricMdp", "");

Loading…
Cancel
Save