From 74f71c1ee743c4a28b8257609d161581e9f9d371 Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Wed, 31 Jan 2018 10:25:41 +0100 Subject: [PATCH 1/4] Use travis docker images --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4fd3e7c..d872fac 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,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 +37,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-debug:travis PYTHON=python3 install: travis/install_linux.sh script: @@ -45,7 +45,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: From 8d9494e1a4d4efee8a61740511eb876c69079029 Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Fri, 16 Feb 2018 13:56:50 +0100 Subject: [PATCH 2/4] Travis: set storm directory --- travis/build-helper.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/travis/build-helper.sh b/travis/build-helper.sh index cfbdda2..328140b 100755 --- a/travis/build-helper.sh +++ b/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 From 5e5247840ac2f559c1b18bfbfc043b85a9d0b948 Mon Sep 17 00:00:00 2001 From: Matthias Volk Date: Mon, 19 Feb 2018 10:05:06 +0100 Subject: [PATCH 3/4] Travis: small fix --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index d872fac..4c79c06 100644 --- a/.travis.yml +++ b/.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: @@ -37,7 +36,7 @@ jobs: # docker storm-debug:latest - os: linux compiler: gcc - env: TASK=Test CONFIG=Debug DOCKER=storm-debug:travis PYTHON=python3 + env: TASK=Test CONFIG=Debug DOCKER=storm:travis-debug PYTHON=python3 install: travis/install_linux.sh script: From 606305ca723f2c52a1842deb6aa31949eda4b751 Mon Sep 17 00:00:00 2001 From: Sebastian Junges Date: Thu, 8 Mar 2018 23:54:52 +0100 Subject: [PATCH 4/4] pla: get split estimates --- src/pars/pla.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pars/pla.cpp b/src/pars/pla.cpp index 2afb288..64de4f4 100644 --- a/src/pars/pla.cpp +++ b/src/pars/pla.cpp @@ -83,6 +83,7 @@ void define_pla(py::module& m) { py::class_> 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); ;