From 225f1e1334250b17919db764ee9fc1ac27c7944d Mon Sep 17 00:00:00 2001
From: hbruintjes <h.bruintjes@cs.rwth-aachen.de>
Date: Thu, 30 Jun 2016 17:32:54 +0200
Subject: [PATCH] Fix module names and import
Former-commit-id: daa4c504277e6b048c5bc66ef5fbffc6692059a5
---
stormpy/lib/stormpy/storage/state.py | 4 ++--
stormpy/src/mod_expressions.cpp | 2 +-
stormpy/src/mod_info.cpp | 2 +-
stormpy/src/mod_logic.cpp | 2 +-
stormpy/src/mod_storage.cpp | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/stormpy/lib/stormpy/storage/state.py b/stormpy/lib/stormpy/storage/state.py
index 1c31f1f1a..f443ac095 100644
--- a/stormpy/lib/stormpy/storage/state.py
+++ b/stormpy/lib/stormpy/storage/state.py
@@ -1,4 +1,4 @@
-import stormpy.storage
+from . import action
class State:
""" Represents a state in the model """
@@ -31,4 +31,4 @@ class State:
row_group_indices = self.model.transition_matrix()._row_group_indices()
start = row_group_indices[self.id]
end = row_group_indices[self.id+1]
- return stormpy.action.Action(start, end, 0, self.model)
+ return action.Action(start, end, 0, self.model)
diff --git a/stormpy/src/mod_expressions.cpp b/stormpy/src/mod_expressions.cpp
index ffe9a223c..75dc2a4be 100644
--- a/stormpy/src/mod_expressions.cpp
+++ b/stormpy/src/mod_expressions.cpp
@@ -4,7 +4,7 @@
#include <src/storage/expressions/ExpressionManager.h>
PYBIND11_PLUGIN(expressions) {
- py::module m("stormpy.expressions", "Storm expressions");
+ py::module m("expressions", "Storm expressions");
py::class_<std::shared_ptr<storm::expressions::ExpressionManager>>(m, "ExpressionManager", "Manages variables for expressions")
;
diff --git a/stormpy/src/mod_info.cpp b/stormpy/src/mod_info.cpp
index c40253c75..dd41617f3 100644
--- a/stormpy/src/mod_info.cpp
+++ b/stormpy/src/mod_info.cpp
@@ -4,7 +4,7 @@
#include <src/utility/storm-version.h>
PYBIND11_PLUGIN(info) {
- py::module m("stormpy.info", "Storm information");
+ py::module m("info", "Storm information");
py::class_<storm::utility::StormVersion>(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")
diff --git a/stormpy/src/mod_logic.cpp b/stormpy/src/mod_logic.cpp
index 49f16d7aa..98fcad102 100644
--- a/stormpy/src/mod_logic.cpp
+++ b/stormpy/src/mod_logic.cpp
@@ -3,7 +3,7 @@
#include "logic/formulae.h"
PYBIND11_PLUGIN(logic) {
- py::module m("stormpy.logic", "Logic module for Storm");
+ py::module m("logic", "Logic module for Storm");
define_formulae(m);
return m.ptr();
}
diff --git a/stormpy/src/mod_storage.cpp b/stormpy/src/mod_storage.cpp
index 436caa96d..835f1e7b2 100644
--- a/stormpy/src/mod_storage.cpp
+++ b/stormpy/src/mod_storage.cpp
@@ -4,7 +4,7 @@
#include "storage/matrix.h"
PYBIND11_PLUGIN(storage) {
- py::module m("stormpy.storage");
+ py::module m("storage");
define_model(m);
define_sparse_matrix(m);
return m.ptr();