From 5e428a795afe24baddacc346fde42ca764764b55 Mon Sep 17 00:00:00 2001 From: sjunges Date: Tue, 18 Aug 2015 13:31:13 +0200 Subject: [PATCH] And more includes on the right spot. Former-commit-id: 72bb348687d518fe5ef35633fbbacc16dba6bdea --- .../MILPMinimalLabelSetGenerator.h | 1 + .../prctl/HybridMdpPrctlModelChecker.cpp | 1 + .../prctl/SymbolicDtmcPrctlModelChecker.cpp | 1 + src/utility/solver.cpp | 8 ++++-- src/utility/solver.h | 25 +++++++++++-------- .../GmmxxCtmcCslModelCheckerTest.cpp | 2 ++ .../GmmxxDtmcPrctlModelCheckerTest.cpp | 1 + .../GmmxxHybridCtmcCslModelCheckerTest.cpp | 2 ++ .../GmmxxHybridDtmcPrctlModelCheckerTest.cpp | 2 ++ .../GmmxxHybridMdpPrctlModelCheckerTest.cpp | 4 +-- .../GmmxxMdpPrctlModelCheckerTest.cpp | 2 ++ .../NativeCtmcCslModelCheckerTest.cpp | 2 ++ .../NativeDtmcPrctlModelCheckerTest.cpp | 2 ++ .../NativeHybridCtmcCslModelCheckerTest.cpp | 2 ++ .../NativeHybridDtmcPrctlModelCheckerTest.cpp | 2 ++ .../NativeHybridMdpPrctlModelCheckerTest.cpp | 2 ++ .../NativeMdpPrctlModelCheckerTest.cpp | 2 ++ .../SymbolicDtmcPrctlModelCheckerTest.cpp | 2 ++ .../solver/FullySymbolicGameSolverTest.cpp | 1 + .../GmmxxDtmcPrctModelCheckerTest.cpp | 1 + .../GmmxxMdpPrctlModelCheckerTest.cpp | 1 + .../NativeDtmcPrctlModelCheckerTest.cpp | 2 ++ .../NativeMdpPrctlModelCheckerTest.cpp | 2 ++ 23 files changed, 56 insertions(+), 14 deletions(-) diff --git a/src/counterexamples/MILPMinimalLabelSetGenerator.h b/src/counterexamples/MILPMinimalLabelSetGenerator.h index 1339d646a..26c1113c8 100644 --- a/src/counterexamples/MILPMinimalLabelSetGenerator.h +++ b/src/counterexamples/MILPMinimalLabelSetGenerator.h @@ -17,6 +17,7 @@ #include "src/utility/graph.h" #include "src/utility/counterexamples.h" #include "src/utility/solver.h" +#include "src/solver/LpSolver.h" #include "src/settings/SettingsManager.h" #include "src/settings/modules/GeneralSettings.h" diff --git a/src/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp b/src/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp index 3f83672b2..bd3f493e9 100644 --- a/src/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp +++ b/src/modelchecker/prctl/HybridMdpPrctlModelChecker.cpp @@ -10,6 +10,7 @@ #include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h" #include "src/modelchecker/results/HybridQuantitativeCheckResult.h" +#include "src/solver/MinMaxLinearEquationSolver.h" #include "src/settings/modules/GeneralSettings.h" diff --git a/src/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.cpp b/src/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.cpp index 30720b091..0e7e4a136 100644 --- a/src/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.cpp +++ b/src/modelchecker/prctl/SymbolicDtmcPrctlModelChecker.cpp @@ -10,6 +10,7 @@ #include "src/modelchecker/results/SymbolicQuantitativeCheckResult.h" #include "src/modelchecker/results/HybridQuantitativeCheckResult.h" +#include "src/solver/SymbolicLinearEquationSolver.h" #include "src/settings/modules/GeneralSettings.h" diff --git a/src/utility/solver.cpp b/src/utility/solver.cpp index 14cd65396..b58e74cb5 100644 --- a/src/utility/solver.cpp +++ b/src/utility/solver.cpp @@ -1,9 +1,9 @@ #include "src/utility/solver.h" -#include "src/settings/SettingsManager.h" - #include "src/solver/SymbolicGameSolver.h" + +#include "src/solver/SymbolicLinearEquationSolver.h" #include "src/solver/NativeLinearEquationSolver.h" #include "src/solver/GmmxxLinearEquationSolver.h" @@ -16,6 +16,10 @@ #include "src/settings/SettingsManager.h" #include "src/settings/modules/GeneralSettings.h" +#include "src/settings/modules/NativeEquationSolverSettings.h" + +#include "src/exceptions/InvalidSettingsException.h" + namespace storm { namespace utility { diff --git a/src/utility/solver.h b/src/utility/solver.h index cd56695f0..661bd90ba 100644 --- a/src/utility/solver.h +++ b/src/utility/solver.h @@ -1,20 +1,25 @@ #ifndef STORM_UTILITY_SOLVER_H_ #define STORM_UTILITY_SOLVER_H_ -#include "src/solver/SymbolicGameSolver.h" - -#include "src/solver/SymbolicLinearEquationSolver.h" -#include "src/solver/LinearEquationSolver.h" #include "src/solver/NativeLinearEquationSolver.h" -#include "src/solver/MinMaxLinearEquationSolver.h" -#include "src/solver/LpSolver.h" - #include "src/storage/dd/DdType.h" -#include "src/settings/modules/NativeEquationSolverSettings.h" - -#include "src/exceptions/InvalidSettingsException.h" namespace storm { + namespace solver { + template class SymbolicGameSolver; + template class SymbolicLinearEquationSolver; + template class LinearEquationSolver; + template class MinMaxLinearEquationSolver; + class LpSolver; + } + namespace dd { + template class Add; + template class Bdd; + } + namespace expressions { + class Variable; + } + namespace utility { namespace solver { template diff --git a/test/functional/modelchecker/GmmxxCtmcCslModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxCtmcCslModelCheckerTest.cpp index 76f178e8f..fea32ac90 100644 --- a/test/functional/modelchecker/GmmxxCtmcCslModelCheckerTest.cpp +++ b/test/functional/modelchecker/GmmxxCtmcCslModelCheckerTest.cpp @@ -12,6 +12,8 @@ #include "src/settings/SettingsManager.h" #include "src/settings/modules/GeneralSettings.h" + +#include "src/settings/modules/NativeEquationSolverSettings.h" #include "src/settings/modules/GmmxxEquationSolverSettings.h" TEST(GmmxxCtmcCslModelCheckerTest, Cluster) { diff --git a/test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp index 01f97ba61..0735dbcfd 100644 --- a/test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp +++ b/test/functional/modelchecker/GmmxxDtmcPrctlModelCheckerTest.cpp @@ -8,6 +8,7 @@ #include "src/settings/SettingsManager.h" #include "src/settings/modules/GeneralSettings.h" #include "src/settings/modules/GmmxxEquationSolverSettings.h" +#include "src/settings/modules/NativeEquationSolverSettings.h" #include "src/settings/SettingMemento.h" #include "src/parser/AutoParser.h" diff --git a/test/functional/modelchecker/GmmxxHybridCtmcCslModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxHybridCtmcCslModelCheckerTest.cpp index f5580a179..874a667af 100644 --- a/test/functional/modelchecker/GmmxxHybridCtmcCslModelCheckerTest.cpp +++ b/test/functional/modelchecker/GmmxxHybridCtmcCslModelCheckerTest.cpp @@ -17,6 +17,8 @@ #include "src/settings/modules/GeneralSettings.h" #include "src/settings/modules/GmmxxEquationSolverSettings.h" +#include "src/settings/modules/NativeEquationSolverSettings.h" + TEST(GmmxxHybridCtmcCslModelCheckerTest, Cluster) { // Set the PRISM compatibility mode temporarily. It is set to its old value once the returned object is destructed. std::unique_ptr enablePrismCompatibility = storm::settings::mutableGeneralSettings().overridePrismCompatibilityMode(true); diff --git a/test/functional/modelchecker/GmmxxHybridDtmcPrctlModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxHybridDtmcPrctlModelCheckerTest.cpp index 4919a2e69..e66a9bb6e 100644 --- a/test/functional/modelchecker/GmmxxHybridDtmcPrctlModelCheckerTest.cpp +++ b/test/functional/modelchecker/GmmxxHybridDtmcPrctlModelCheckerTest.cpp @@ -14,6 +14,8 @@ #include "src/settings/modules/GeneralSettings.h" #include "src/settings/modules/GmmxxEquationSolverSettings.h" +#include "src/settings/modules/NativeEquationSolverSettings.h" + TEST(GmmxxHybridDtmcPrctlModelCheckerTest, Die) { storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/die.pm"); diff --git a/test/functional/modelchecker/GmmxxHybridMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxHybridMdpPrctlModelCheckerTest.cpp index 935cf9fb3..d480c01af 100644 --- a/test/functional/modelchecker/GmmxxHybridMdpPrctlModelCheckerTest.cpp +++ b/test/functional/modelchecker/GmmxxHybridMdpPrctlModelCheckerTest.cpp @@ -10,10 +10,10 @@ #include "src/parser/PrismParser.h" #include "src/builder/DdPrismModelBuilder.h" #include "src/models/symbolic/Dtmc.h" -#include "src/settings/SettingsManager.h" +#include "src/settings/SettingsManager.h" #include "src/settings/modules/GeneralSettings.h" - +#include "src/settings/modules/NativeEquationSolverSettings.h" #include "src/settings/modules/GmmxxEquationSolverSettings.h" TEST(GmmxxHybridMdpPrctlModelCheckerTest, Dice) { diff --git a/test/functional/modelchecker/GmmxxMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/GmmxxMdpPrctlModelCheckerTest.cpp index 69dcda869..ac5c62f15 100644 --- a/test/functional/modelchecker/GmmxxMdpPrctlModelCheckerTest.cpp +++ b/test/functional/modelchecker/GmmxxMdpPrctlModelCheckerTest.cpp @@ -9,6 +9,8 @@ #include "src/settings/modules/GeneralSettings.h" #include "src/settings/modules/GmmxxEquationSolverSettings.h" + +#include "src/settings/modules/NativeEquationSolverSettings.h" #include "src/parser/AutoParser.h" TEST(GmmxxMdpPrctlModelCheckerTest, Dice) { diff --git a/test/functional/modelchecker/NativeCtmcCslModelCheckerTest.cpp b/test/functional/modelchecker/NativeCtmcCslModelCheckerTest.cpp index a7ee670b6..2e6684ae5 100644 --- a/test/functional/modelchecker/NativeCtmcCslModelCheckerTest.cpp +++ b/test/functional/modelchecker/NativeCtmcCslModelCheckerTest.cpp @@ -14,6 +14,8 @@ #include "src/settings/modules/GeneralSettings.h" +#include "src/settings/modules/NativeEquationSolverSettings.h" + TEST(SparseCtmcCslModelCheckerTest, Cluster) { // Set the PRISM compatibility mode temporarily. It is set to its old value once the returned object is destructed. std::unique_ptr enablePrismCompatibility = storm::settings::mutableGeneralSettings().overridePrismCompatibilityMode(true); diff --git a/test/functional/modelchecker/NativeDtmcPrctlModelCheckerTest.cpp b/test/functional/modelchecker/NativeDtmcPrctlModelCheckerTest.cpp index ced23c35e..f9dc4ff7b 100644 --- a/test/functional/modelchecker/NativeDtmcPrctlModelCheckerTest.cpp +++ b/test/functional/modelchecker/NativeDtmcPrctlModelCheckerTest.cpp @@ -9,6 +9,8 @@ #include "src/settings/SettingsManager.h" #include "src/settings/modules/GeneralSettings.h" + +#include "src/settings/modules/NativeEquationSolverSettings.h" #include "src/settings/SettingMemento.h" #include "src/parser/AutoParser.h" diff --git a/test/functional/modelchecker/NativeHybridCtmcCslModelCheckerTest.cpp b/test/functional/modelchecker/NativeHybridCtmcCslModelCheckerTest.cpp index 8cade7ab9..aeb28084d 100644 --- a/test/functional/modelchecker/NativeHybridCtmcCslModelCheckerTest.cpp +++ b/test/functional/modelchecker/NativeHybridCtmcCslModelCheckerTest.cpp @@ -16,6 +16,8 @@ #include "src/settings/SettingsManager.h" #include "src/settings/modules/GeneralSettings.h" +#include "src/settings/modules/NativeEquationSolverSettings.h" + TEST(NativeHybridCtmcCslModelCheckerTest, Cluster) { // Set the PRISM compatibility mode temporarily. It is set to its old value once the returned object is destructed. std::unique_ptr enablePrismCompatibility = storm::settings::mutableGeneralSettings().overridePrismCompatibilityMode(true); diff --git a/test/functional/modelchecker/NativeHybridDtmcPrctlModelCheckerTest.cpp b/test/functional/modelchecker/NativeHybridDtmcPrctlModelCheckerTest.cpp index ad5aa1a1a..eca106543 100644 --- a/test/functional/modelchecker/NativeHybridDtmcPrctlModelCheckerTest.cpp +++ b/test/functional/modelchecker/NativeHybridDtmcPrctlModelCheckerTest.cpp @@ -15,6 +15,8 @@ #include "src/settings/modules/GmmxxEquationSolverSettings.h" +#include "src/settings/modules/NativeEquationSolverSettings.h" + TEST(NativeHybridDtmcPrctlModelCheckerTest, Die) { storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/die.pm"); diff --git a/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp index ba6e37abd..e1913a1de 100644 --- a/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp +++ b/test/functional/modelchecker/NativeHybridMdpPrctlModelCheckerTest.cpp @@ -14,6 +14,8 @@ #include "src/settings/modules/GeneralSettings.h" +#include "src/settings/modules/NativeEquationSolverSettings.h" + TEST(NativeHybridMdpPrctlModelCheckerTest, Dice) { storm::prism::Program program = storm::parser::PrismParser::parse(STORM_CPP_TESTS_BASE_PATH "/functional/builder/two_dice.nm"); diff --git a/test/functional/modelchecker/NativeMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/NativeMdpPrctlModelCheckerTest.cpp index 87a4f0e21..d3bee454d 100644 --- a/test/functional/modelchecker/NativeMdpPrctlModelCheckerTest.cpp +++ b/test/functional/modelchecker/NativeMdpPrctlModelCheckerTest.cpp @@ -8,6 +8,8 @@ #include "src/settings/SettingsManager.h" #include "src/settings/modules/GeneralSettings.h" + +#include "src/settings/modules/NativeEquationSolverSettings.h" #include "src/parser/AutoParser.h" TEST(SparseMdpPrctlModelCheckerTest, Dice) { diff --git a/test/functional/modelchecker/SymbolicDtmcPrctlModelCheckerTest.cpp b/test/functional/modelchecker/SymbolicDtmcPrctlModelCheckerTest.cpp index 3ecea41a7..52638f8b7 100644 --- a/test/functional/modelchecker/SymbolicDtmcPrctlModelCheckerTest.cpp +++ b/test/functional/modelchecker/SymbolicDtmcPrctlModelCheckerTest.cpp @@ -11,6 +11,8 @@ #include "src/models/symbolic/Dtmc.h" #include "src/settings/SettingsManager.h" +#include "src/settings/modules/NativeEquationSolverSettings.h" + #include "src/settings/modules/GeneralSettings.h" TEST(SymbolicDtmcPrctlModelCheckerTest, Die) { diff --git a/test/functional/solver/FullySymbolicGameSolverTest.cpp b/test/functional/solver/FullySymbolicGameSolverTest.cpp index d2ea6db1c..ce9e21798 100644 --- a/test/functional/solver/FullySymbolicGameSolverTest.cpp +++ b/test/functional/solver/FullySymbolicGameSolverTest.cpp @@ -7,6 +7,7 @@ #include "src/utility/solver.h" #include "src/settings/SettingsManager.h" +#include "src/solver/SymbolicGameSolver.h" #include "src/settings/modules/NativeEquationSolverSettings.h" diff --git a/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp b/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp index ea480bd22..0ecce639f 100644 --- a/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp +++ b/test/performance/modelchecker/GmmxxDtmcPrctModelCheckerTest.cpp @@ -2,6 +2,7 @@ #include "storm-config.h" #include "src/settings/SettingsManager.h" #include "src/settings/modules/GmmxxEquationSolverSettings.h" +#include "src/settings/modules/NativeEquationSolverSettings.h" #include "src/settings/SettingMemento.h" #include "src/modelchecker/prctl/SparseDtmcPrctlModelChecker.h" #include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h" diff --git a/test/performance/modelchecker/GmmxxMdpPrctlModelCheckerTest.cpp b/test/performance/modelchecker/GmmxxMdpPrctlModelCheckerTest.cpp index 1db6f796d..527dbed69 100644 --- a/test/performance/modelchecker/GmmxxMdpPrctlModelCheckerTest.cpp +++ b/test/performance/modelchecker/GmmxxMdpPrctlModelCheckerTest.cpp @@ -2,6 +2,7 @@ #include "storm-config.h" #include "src/settings/SettingsManager.h" +#include "src/settings/modules/NativeEquationSolverSettings.h" #include "src/modelchecker/prctl/SparseMdpPrctlModelChecker.h" #include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h" #include "src/utility/solver.h" diff --git a/test/performance/modelchecker/NativeDtmcPrctlModelCheckerTest.cpp b/test/performance/modelchecker/NativeDtmcPrctlModelCheckerTest.cpp index bc0b5b563..cce9c8878 100644 --- a/test/performance/modelchecker/NativeDtmcPrctlModelCheckerTest.cpp +++ b/test/performance/modelchecker/NativeDtmcPrctlModelCheckerTest.cpp @@ -2,6 +2,8 @@ #include "storm-config.h" #include "src/settings/SettingsManager.h" #include "src/settings/modules/GmmxxEquationSolverSettings.h" + +#include "src/settings/modules/NativeEquationSolverSettings.h" #include "src/settings/SettingMemento.h" #include "src/modelchecker/prctl/SparseDtmcPrctlModelChecker.h" #include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h" diff --git a/test/performance/modelchecker/NativeMdpPrctlModelCheckerTest.cpp b/test/performance/modelchecker/NativeMdpPrctlModelCheckerTest.cpp index 788f1fee6..e327910d8 100644 --- a/test/performance/modelchecker/NativeMdpPrctlModelCheckerTest.cpp +++ b/test/performance/modelchecker/NativeMdpPrctlModelCheckerTest.cpp @@ -4,6 +4,8 @@ #include "src/settings/SettingsManager.h" #include "src/modelchecker/prctl/SparseMdpPrctlModelChecker.h" #include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h" + +#include "src/settings/modules/NativeEquationSolverSettings.h" #include "src/utility/solver.h" #include "src/parser/AutoParser.h"