Merge branch 'master' into wrap_highlevel

.travis.yml

@@ -4,14 +4,13 @@
 branches:
   only:
   - master
+sudo: required
 dist: trusty
 language: generic
 
 # Enable docker support
 services:
 - docker
-sudo: required
-group: deprecated-2017Q2
 
 notifications:
   email:
@@ -29,7 +28,7 @@ jobs:
     # docker storm:latest
     - os: linux
       compiler: gcc
-      env: TASK=Test CONFIG=Release DOCKER=storm:latest PYTHON=python3
+      env: TASK=Test CONFIG=Release DOCKER=storm:travis PYTHON=python3
       install:
         travis/install_linux.sh
       script:
@@ -37,7 +36,7 @@ jobs:
     # docker storm-debug:latest
     - os: linux
       compiler: gcc
-      env: TASK=Test CONFIG=Debug DOCKER=storm-debug:latest PYTHON=python3
+      env: TASK=Test CONFIG=Debug DOCKER=storm:travis-debug PYTHON=python3
       install:
         travis/install_linux.sh
       script:
@@ -45,7 +44,7 @@ jobs:
     # Documentation
     - os: linux
       compiler: gcc
-      env: TASK=Documentation CONFIG=Release DOCKER=storm:latest PYTHON=python3
+      env: TASK=Documentation CONFIG=Release DOCKER=storm:travis PYTHON=python3
       install:
         travis/install_linux.sh
       script:

src/pars/pla.cpp

@@ -83,6 +83,7 @@ void define_pla(py::module& m) {
     py::class_<RegionModelChecker, std::shared_ptr<RegionModelChecker>> regionModelChecker(m, "RegionModelChecker", "Region model checker via paramater lifting");
     regionModelChecker.def("check_region", &checkRegion, "Check region", py::arg("environment"), py::arg("region"), py::arg("hypothesis") = storm::modelchecker::RegionResultHypothesis::Unknown, py::arg("initialResult") = storm::modelchecker::RegionResult::Unknown, py::arg("sampleVertices") = false)
         .def("get_bound", &getBoundAtInit, "Get bound", py::arg("environment"), py::arg("region"), py::arg("maximise")= true)
+        .def("get_split_suggestion", &RegionModelChecker::getRegionSplitEstimate, "Get estimate")
         .def("specify", &specify, "specify arguments",py::arg("environment"), py::arg("model"), py::arg("formula"), py::arg("generate_splitting_estimate") = false, py::arg("allow_model_simplification") = true);
     ;
 

travis/build-helper.sh

@@ -36,10 +36,10 @@ run() {
   travis_fold start build_stormpy
   case "$CONFIG" in
   Debug*)
-    python setup.py build_ext --debug -j 1 develop
+    python setup.py build_ext --storm-dir /opt/storm/build/ --debug -j 1 develop
     ;;
   *)
-    python setup.py build_ext -j 1 develop
+    python setup.py build_ext --storm-dir /opt/storm/build/ -j 1 develop
     ;;
   esac
   travis_fold end build_stormpy