From 4620bd3ca246c8f65b18d4bbabf7f2d969d0be25 Mon Sep 17 00:00:00 2001 From: Mavo Date: Thu, 28 Apr 2016 17:14:59 +0200 Subject: [PATCH] Refactored info module Former-commit-id: 9ff28bed735adda54c324e50adf75b6e5c078723 --- src/python/storm-info.cpp | 12 ------------ stormpy/src/info/common.h | 7 ------- stormpy/src/info/info.cpp | 13 ------------- stormpy/src/info/info.h | 8 -------- stormpy/src/mod_info.cpp | 10 +++++++--- 5 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 src/python/storm-info.cpp delete mode 100644 stormpy/src/info/common.h delete mode 100644 stormpy/src/info/info.cpp delete mode 100644 stormpy/src/info/info.h diff --git a/src/python/storm-info.cpp b/src/python/storm-info.cpp deleted file mode 100644 index 5c60c8ffd..000000000 --- a/src/python/storm-info.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include -#include "../utility/storm-version.h" - -BOOST_PYTHON_MODULE(_info) -{ - using namespace boost::python; - class_("Version") - .def("short", &storm::utility::StormVersion::shortVersionString) - .def("long", &storm::utility::StormVersion::longVersionString) - .def("build_info", &storm::utility::StormVersion::buildInfo) - ; -} \ No newline at end of file diff --git a/stormpy/src/info/common.h b/stormpy/src/info/common.h deleted file mode 100644 index 0b0007d5c..000000000 --- a/stormpy/src/info/common.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef PYTHON_INFO_COMMON_H_ -#define PYTHON_INFO_COMMON_H_ - -//toString -#include "src/helpers.h" - -#endif /* PYTHON_INFO_COMMON_H_ */ diff --git a/stormpy/src/info/info.cpp b/stormpy/src/info/info.cpp deleted file mode 100644 index a9defcab3..000000000 --- a/stormpy/src/info/info.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "info.h" - -#include "common.h" -#include - -void define_info(py::module& m) { - py::class_(m, "Version") - - .def("short", &storm::utility::StormVersion::shortVersionString) - .def("long", &storm::utility::StormVersion::longVersionString) - .def("build_info", &storm::utility::StormVersion::buildInfo) - ; -} diff --git a/stormpy/src/info/info.h b/stormpy/src/info/info.h deleted file mode 100644 index 21b599f03..000000000 --- a/stormpy/src/info/info.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef PYTHON_INFO_INFO_H_ -#define PYTHON_INFO_INFO_H_ - -#include "src/common.h" - -void define_info(py::module& m); - -#endif /* PYTHON_INFO_INFO_H_ */ diff --git a/stormpy/src/mod_info.cpp b/stormpy/src/mod_info.cpp index 4f57dac4b..c40253c75 100644 --- a/stormpy/src/mod_info.cpp +++ b/stormpy/src/mod_info.cpp @@ -1,10 +1,14 @@ #include "common.h" #include "helpers.h" -#include "info/info.h" +#include PYBIND11_PLUGIN(info) { - py::module m("stormpy.info", "stormpy info handling"); - define_info(m); + py::module m("stormpy.info", "Storm information"); + py::class_(m, "Version", "Version information for Storm") + .def("short", &storm::utility::StormVersion::shortVersionString, "Storm version in short representation") + .def("long", &storm::utility::StormVersion::longVersionString, "Storm version in long representation") + .def("build_info", &storm::utility::StormVersion::buildInfo, "Build info for Storm") + ; return m.ptr(); }