diff --git a/setup.py b/setup.py index a9c58a489..d0db28312 100644 --- a/setup.py +++ b/setup.py @@ -74,10 +74,11 @@ setup(cmdclass={'install': MyInstall, 'develop': MyDevelop, 'egg_info': MyEggInf version="0.2", description="Stormpy - Python Bindings for Storm", package_dir={'':d}, - packages=['stormpy', 'stormpy.core', 'stormpy.info', 'stormpy.logic'], + packages=['stormpy', 'stormpy.core', 'stormpy.info', 'stormpy.logic', 'stormpy.expressions'], package_data={'stormpy.core': ['_core.so'], 'stormpy.logic': ['_logic.so'], 'stormpy.info' : ['_info.so'] , + 'stormpy.expressions' : ['_expressions.so'], 'stormpy': ['*.so', '*.dylib', '*.a']}, include_package_data=True) \ No newline at end of file diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt index bc9a1f19e..7837bc169 100644 --- a/src/python/CMakeLists.txt +++ b/src/python/CMakeLists.txt @@ -21,5 +21,6 @@ if(STORM_PYTHON) add_python_module(stormpy-info info ${CMAKE_CURRENT_SOURCE_DIR}/storm-info.cpp) add_python_module(stormpy-core core ${CMAKE_CURRENT_SOURCE_DIR}/storm-core.cpp) add_python_module(stormpy-logic logic ${CMAKE_CURRENT_SOURCE_DIR}/storm-logic.cpp) - add_custom_target(stormpy DEPENDS stormpy-info stormpy-core stormpy-logic) + add_python_module(stormpy-expression expressions ${CMAKE_CURRENT_SOURCE_DIR}/storm-expression.cpp) + add_custom_target(stormpy DEPENDS stormpy-info stormpy-core stormpy-logic stormpy-expression) endif() diff --git a/src/python/storm-expression.cpp b/src/python/storm-expression.cpp new file mode 100644 index 000000000..98043bc4b --- /dev/null +++ b/src/python/storm-expression.cpp @@ -0,0 +1,19 @@ +#include +#include + +#include "helpers.h" +#include "boostPyExtension.h" + +#include "../storage/expressions/ExpressionManager.h" + + +BOOST_PYTHON_MODULE(_expressions) +{ + using namespace boost::python; + + defineClass("ExpressionManager", + "Manages variables for expressions"); + defineClass("Expression", + ""); + +} diff --git a/stormpy/expressions/__init__.py b/stormpy/expressions/__init__.py new file mode 100644 index 000000000..6522889ea --- /dev/null +++ b/stormpy/expressions/__init__.py @@ -0,0 +1 @@ +from stormpy.expressions._expressions import * \ No newline at end of file