From 70a54e26c9e0e3e3f9b73a47845261149cb64950 Mon Sep 17 00:00:00 2001
From: sjunges <sebastian.junges@gmail.com>
Date: Sun, 10 Jun 2018 21:29:45 +0200
Subject: [PATCH] updated based on changes in storm

---
 CMakeLists.txt              | 8 ++++----
 src/core/core.cpp           | 1 +
 src/core/counterexample.cpp | 1 +
 src/core/input.cpp          | 1 +
 src/core/modelchecking.cpp  | 1 +
 src/core/result.cpp         | 3 +++
 src/pars/common.h           | 3 +++
 src/storage/expressions.cpp | 2 +-
 8 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af8c593..cbe6851 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,11 +20,11 @@ function(stormpy_module NAME)
 
     if(ARGC GREATER 1)
         # Additional libraries
-        target_include_directories(${NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${storm_INCLUDE_DIR} ${ARGV2} ${CMAKE_CURRENT_BINARY_DIR}/src/generated)
-        target_link_libraries(${NAME} PRIVATE storm ${ARGV1})
+        target_include_directories(${NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${storm_INCLUDE_DIR} ${storm-parsers_INCLUDE_DIR} ${storm-counterexamples_INCLUDE_DIR}  ${ARGV2} ${CMAKE_CURRENT_BINARY_DIR}/src/generated)
+        target_link_libraries(${NAME} PRIVATE storm storm-parsers storm-counterexamples ${ARGV1})
     else()
-        target_include_directories(${NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${storm_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/src/generated)
-        target_link_libraries(${NAME} PRIVATE storm)
+        target_include_directories(${NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${storm_INCLUDE_DIR} ${storm-parsers_INCLUDE_DIR} ${storm-counterexamples_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/src/generated)
+        target_link_libraries(${NAME} PRIVATE storm storm-parsers storm-counterexamples)
     endif()
 endfunction(stormpy_module)
 
diff --git a/src/core/core.cpp b/src/core/core.cpp
index 8df3e2e..bbb8790 100644
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -5,6 +5,7 @@
 #include "storm/storage/dd/DdType.h"
 #include "storm/solver/OptimizationDirection.h"
 #include "storm/models/symbolic/StandardRewardModel.h"
+#include "storm-parsers/api/storm-parsers.h"
 
 
 void define_core(py::module& m) {
diff --git a/src/core/counterexample.cpp b/src/core/counterexample.cpp
index 7f8be55..011313e 100644
--- a/src/core/counterexample.cpp
+++ b/src/core/counterexample.cpp
@@ -1,5 +1,6 @@
 #include "counterexample.h"
 #include "storm/environment/Environment.h"
+#include "storm-counterexamples/api/counterexamples.h"
 
 using namespace storm::counterexamples;
 
diff --git a/src/core/input.cpp b/src/core/input.cpp
index 29c7c3e..baf51dc 100644
--- a/src/core/input.cpp
+++ b/src/core/input.cpp
@@ -1,5 +1,6 @@
 #include "input.h"
 #include "src/helpers.h"
+#include "storm-parsers/api/storm-parsers.h"
 
 void define_property(py::module& m) {
     py::class_<storm::jani::Property>(m, "Property", "Property")
diff --git a/src/core/modelchecking.cpp b/src/core/modelchecking.cpp
index 7faafe0..862d4c3 100644
--- a/src/core/modelchecking.cpp
+++ b/src/core/modelchecking.cpp
@@ -1,6 +1,7 @@
 #include "modelchecking.h"
 #include "result.h"
 #include "storm/models/symbolic/StandardRewardModel.h"
+#include "storm/modelchecker/results/CheckResult.h"
 
 template<typename ValueType>
 using CheckTask = storm::modelchecker::CheckTask<storm::logic::Formula, ValueType>;
diff --git a/src/core/result.cpp b/src/core/result.cpp
index 45ac4a7..4e6728d 100644
--- a/src/core/result.cpp
+++ b/src/core/result.cpp
@@ -3,6 +3,9 @@
 #include "storm/modelchecker/results/SymbolicQualitativeCheckResult.h"
 #include "storm/modelchecker/results/SymbolicQuantitativeCheckResult.h"
 #include "storm/modelchecker/results/HybridQuantitativeCheckResult.h"
+#include "storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
+
 #include "storm/models/symbolic/StandardRewardModel.h"
 
 // Define python bindings
diff --git a/src/pars/common.h b/src/pars/common.h
index 79a9840..e7a604d 100644
--- a/src/pars/common.h
+++ b/src/pars/common.h
@@ -1,3 +1,6 @@
 #include "src/common.h"
 
 #include "storm-pars/api/storm-pars.h"
+
+#include "storm/modelchecker/results/ExplicitQuantitativeCheckResult.h"
+#include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h"
\ No newline at end of file
diff --git a/src/storage/expressions.cpp b/src/storage/expressions.cpp
index f3f78b4..4132c1e 100644
--- a/src/storage/expressions.cpp
+++ b/src/storage/expressions.cpp
@@ -3,7 +3,7 @@
 
 #include "storm/storage/expressions/ExpressionManager.h"
 #include "storm/storage/expressions/Expression.h"
-#include "storm/parser/ExpressionParser.h"
+#include "storm-parsers/parser/ExpressionParser.h"
 
 //Define python bindings
 void define_expressions(py::module& m) {