Merge remote-tracking branch 'upstream/master'

randriu · May 30, 2024 · 1af567e · 1af567e
2 parents ee74ffa + 7485b71
commit 1af567e
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 24 deletions.
diff --git a/payntbind/src/synthesis/counterexamples/Counterexample.cpp b/payntbind/src/synthesis/counterexamples/Counterexample.cpp
@@ -1,25 +1,26 @@
 #include "Counterexample.h"
 
-#include "storm/storage/BitVector.h"
-#include "storm/exceptions/UnexpectedException.h"
+#include <storm/storage/BitVector.h>
+#include <storm/exceptions/InvalidArgumentException.h>
+#include <storm/exceptions/NotImplementedException.h>
 
-#include "storm/storage/sparse/JaniChoiceOrigins.h"
-#include "storm/storage/sparse/StateValuations.h"
+#include <storm/storage/sparse/JaniChoiceOrigins.h>
+#include <storm/storage/sparse/StateValuations.h>
 
-#include "storm/utility/builder.h"
-#include "storm/storage/SparseMatrix.h"
-#include "storm/storage/sparse/ModelComponents.h"
-#include "storm/models/sparse/StateLabeling.h"
+#include <storm/utility/builder.h>
+#include <storm/storage/SparseMatrix.h>
+#include <storm/storage/sparse/ModelComponents.h>
+#include <storm/models/sparse/StateLabeling.h>
 
-#include "storm/solver/OptimizationDirection.h"
+#include <storm/solver/OptimizationDirection.h>
 
-#include "storm/api/verification.h"
-#include "storm/logic/Bound.h"
-#include "storm/modelchecker/CheckTask.h"
-#include "storm/modelchecker/hints/ExplicitModelCheckerHint.h"
+#include <storm/api/verification.h>
+#include <storm/logic/Bound.h>
+#include <storm/modelchecker/CheckTask.h>
+#include <storm/modelchecker/hints/ExplicitModelCheckerHint.h>
 
-#include "storm/environment/Environment.h"
-#include "storm/environment/solver/SolverEnvironment.h"
+#include <storm/environment/Environment.h>
+#include <storm/environment/solver/SolverEnvironment.h>
 
 #include <stack>
 

diff --git a/payntbind/src/synthesis/counterexamples/CounterexampleMdp.cpp b/payntbind/src/synthesis/counterexamples/CounterexampleMdp.cpp
@@ -1,7 +1,9 @@
 #include "CounterexampleMdp.h"
 
 #include <storm/storage/BitVector.h>
-#include <storm/exceptions/UnexpectedException.h>
+#include <storm/exceptions/InvalidArgumentException.h>
+#include <storm/exceptions/NotImplementedException.h>
+
 #include <storm/storage/sparse/JaniChoiceOrigins.h>
 #include <storm/storage/sparse/StateValuations.h>
 #include <storm/utility/builder.h>

diff --git a/payntbind/src/synthesis/decpomdp/DecPomdp.h b/payntbind/src/synthesis/decpomdp/DecPomdp.h
@@ -3,9 +3,10 @@
 #include "madp/src/base/POMDPDiscrete.h"
 #include "madp/src/base/DecPOMDPDiscrete.h"
 
-#include "storm/models/sparse/Mdp.h"
-#include "storm/models/sparse/Pomdp.h"
-#include "storm/models/sparse/StandardRewardModel.h"
+#include <storm/adapters/RationalNumberAdapter.h>
+#include <storm/models/sparse/Mdp.h>
+#include <storm/models/sparse/Pomdp.h>
+#include <storm/models/sparse/StandardRewardModel.h>
 
 #include <string>
 
@@ -19,6 +20,7 @@ namespace synthesis {
     class DecPomdp {
 
     public:
+
         DecPomdp(DecPOMDPDiscrete *model);
 
         /** Number of agents. */

diff --git a/payntbind/src/synthesis/pomdp/PomdpManager.h b/payntbind/src/synthesis/pomdp/PomdpManager.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "storm/models/sparse/Mdp.h"
-#include "storm/models/sparse/Pomdp.h"
+#include <storm/adapters/RationalNumberAdapter.h>
+#include <storm/models/sparse/Mdp.h>
+#include <storm/models/sparse/Pomdp.h>
 
 namespace synthesis {
 

diff --git a/payntbind/src/synthesis/pomdp/PomdpManagerAposteriori.h b/payntbind/src/synthesis/pomdp/PomdpManagerAposteriori.h
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "storm/models/sparse/Mdp.h"
-#include "storm/models/sparse/Pomdp.h"
+#include <storm/adapters/RationalNumberAdapter.h>
+#include <storm/models/sparse/Mdp.h>
+#include <storm/models/sparse/Pomdp.h>
 
 #include <stack>
 
-
 namespace synthesis {
 
     template<typename ValueType>

diff --git a/payntbind/src/synthesis/pomdp_family/ProductPomdpFsc.h b/payntbind/src/synthesis/pomdp_family/ProductPomdpFsc.h
@@ -2,6 +2,7 @@
 
 #include "src/synthesis/translation/ItemKeyTranslator.h"
 
+#include <storm/adapters/RationalNumberAdapter.h>
 #include <storm/models/sparse/Model.h>
 #include <storm/models/sparse/Mdp.h>
 #include <storm/storage/BitVector.h>

diff --git a/payntbind/src/synthesis/pomdp_family/ProductPomdpRandomizedFsc.h b/payntbind/src/synthesis/pomdp_family/ProductPomdpRandomizedFsc.h
@@ -2,6 +2,7 @@
 
 #include "src/synthesis/translation/ItemKeyTranslator.h"
 
+#include <storm/adapters/RationalNumberAdapter.h>
 #include <storm/models/sparse/Model.h>
 #include <storm/models/sparse/Mdp.h>
 #include <storm/storage/BitVector.h>

diff --git a/payntbind/src/synthesis/translation/SubPomdpBuilder.h b/payntbind/src/synthesis/translation/SubPomdpBuilder.h
@@ -2,6 +2,8 @@
 
 #include "src/synthesis/translation/ItemTranslator.h"
 
+#include <storm/adapters/RationalNumberAdapter.h>
+#include <storm/models/sparse/Model.h>
 #include <storm/models/sparse/Pomdp.h>
 
 namespace synthesis {