From d6bfcb481817a7298043b79a0bba878050b23f57 Mon Sep 17 00:00:00 2001 From: Sebastian Junges Date: Tue, 21 Jul 2020 20:41:40 -0700 Subject: [PATCH] refactoring: moving some code out of the util folder --- src/storm-cli-utilities/cli.cpp | 4 ++-- src/storm-cli-utilities/model-handling.h | 2 +- .../utility => storm-cli-utilities}/resources.h | 6 +----- src/storm-conv/api/storm-conv.cpp | 2 +- .../counterexamples/PathCounterexample.cpp | 2 +- src/storm-dft/modelchecker/dft/DFTASFChecker.cpp | 2 +- src/storm-dft/modelchecker/dft/DFTModelChecker.cpp | 2 +- src/storm-dft/parser/DFTGalileoParser.cpp | 2 +- src/storm-dft/parser/DFTJsonParser.cpp | 2 +- src/storm-dft/storage/dft/DftJsonExporter.cpp | 2 +- src/storm-gspn/api/storm-gspn.cpp | 2 +- src/storm-pars-cli/storm-pars.cpp | 2 +- src/storm-pars/api/export.h | 2 +- src/storm-pars/api/region.h | 2 +- src/storm-pars/parser/ParameterRegionParser.cpp | 2 +- .../parser/AtomicPropositionLabelingParser.cpp | 2 +- src/storm-parsers/parser/AutoParser.cpp | 2 +- .../parser/DeterministicSparseTransitionParser.cpp | 2 +- src/storm-parsers/parser/DirectEncodingParser.cpp | 2 +- src/storm-parsers/parser/FormulaParser.cpp | 2 +- .../parser/ImcaMarkovAutomatonParser.cpp | 2 +- src/storm-parsers/parser/JaniParser.cpp | 2 +- src/storm-parsers/parser/MappedFile.cpp | 2 +- .../parser/MarkovAutomatonSparseTransitionParser.cpp | 2 +- .../NondeterministicSparseTransitionParser.cpp | 2 +- src/storm-parsers/parser/PrismParser.cpp | 2 +- src/storm-parsers/parser/ReadValues.h | 2 +- .../parser/SparseChoiceLabelingParser.cpp | 2 +- .../parser/SparseItemLabelingParser.cpp | 2 +- src/storm-parsers/parser/SparseStateRewardParser.cpp | 2 +- .../utility => storm-parsers/util}/cstring.cpp | 2 +- src/{storm/utility => storm-parsers/util}/cstring.h | 12 +----------- src/storm-pgcl-cli/storm-pgcl.cpp | 2 +- src/storm-pgcl/parser/PgclParser.cpp | 2 +- src/storm-pomdp/analysis/IterativePolicySearch.cpp | 2 +- src/storm-pomdp/analysis/OneShotPolicySearch.cpp | 2 +- src/storm-pomdp/analysis/WinningRegion.cpp | 2 +- src/storm/abstraction/MenuGameAbstractor.cpp | 2 +- src/storm/adapters/EigenAdapter.h | 2 +- src/storm/adapters/GmmxxAdapter.h | 2 +- src/storm/{utility => adapters}/eigen.h | 0 src/storm/{utility => adapters}/gmm.h | 0 src/storm/{utility => adapters}/sylvan.cpp | 2 +- src/storm/{utility => adapters}/sylvan.h | 0 src/storm/api/export.h | 6 +++--- src/storm/{utility => io}/DDEncodingExporter.cpp | 4 ++-- src/storm/{utility => io}/DDEncodingExporter.h | 0 src/storm/{utility => io}/DirectEncodingExporter.cpp | 2 +- src/storm/{utility => io}/DirectEncodingExporter.h | 0 src/storm/{utility => io}/export.h | 2 +- src/storm/{utility => io}/file.h | 0 .../DeterministicSchedsParetoExplorer.cpp | 2 +- .../pcaa/RewardBoundedMdpPcaaWeightVectorChecker.cpp | 2 +- .../multiobjective/pcaa/SparsePcaaQuery.cpp | 2 +- .../prctl/helper/SparseDtmcPrctlHelper.cpp | 2 +- .../prctl/helper/SparseMdpPrctlHelper.cpp | 2 +- src/storm/models/sparse/DeterministicModel.cpp | 2 +- src/storm/models/sparse/Model.cpp | 2 +- src/storm/models/sparse/NondeterministicModel.cpp | 2 +- src/storm/settings/SettingsManager.cpp | 2 +- src/storm/solver/EigenLinearEquationSolver.h | 2 +- src/storm/solver/GmmxxLinearEquationSolver.cpp | 2 +- src/storm/solver/GmmxxLinearEquationSolver.h | 2 +- src/storm/solver/SmtlibSmtSolver.cpp | 2 +- src/storm/solver/Z3LpSolver.cpp | 2 +- src/storm/storage/Qvbs.cpp | 2 +- src/storm/storage/dd/Odd.cpp | 2 +- src/storm/storage/dd/sylvan/InternalSylvanBdd.h | 2 +- .../storage/dd/sylvan/InternalSylvanDdManager.cpp | 2 +- src/storm/storage/dd/sylvan/SylvanAddIterator.h | 2 +- src/storm/storage/dd/sylvan/utility.h | 2 +- src/storm/storage/expressions/Type.cpp | 2 +- .../nativepolytopeconversion/SubsetEnumerator.cpp | 2 +- src/storm/storage/jani/JSONExporter.cpp | 2 +- src/test/storm/parser/MappedFileTest.cpp | 4 ++-- .../MarkovAutomatonSparseTransitionParserTest.cpp | 2 +- src/test/storm/utility/FileTest.cpp | 2 +- 77 files changed, 76 insertions(+), 90 deletions(-) rename src/{storm/utility => storm-cli-utilities}/resources.h (93%) rename src/{storm/utility => storm-parsers/util}/cstring.cpp (98%) rename src/{storm/utility => storm-parsers/util}/cstring.h (85%) rename src/storm/{utility => adapters}/eigen.h (100%) rename src/storm/{utility => adapters}/gmm.h (100%) rename src/storm/{utility => adapters}/sylvan.cpp (93%) rename src/storm/{utility => adapters}/sylvan.h (100%) rename src/storm/{utility => io}/DDEncodingExporter.cpp (96%) rename src/storm/{utility => io}/DDEncodingExporter.h (100%) rename src/storm/{utility => io}/DirectEncodingExporter.cpp (99%) rename src/storm/{utility => io}/DirectEncodingExporter.h (100%) rename src/storm/{utility => io}/export.h (98%) rename src/storm/{utility => io}/file.h (100%) diff --git a/src/storm-cli-utilities/cli.cpp b/src/storm-cli-utilities/cli.cpp index ea7c29354..2e0e0ef9f 100644 --- a/src/storm-cli-utilities/cli.cpp +++ b/src/storm-cli-utilities/cli.cpp @@ -1,8 +1,8 @@ #include "cli.h" -#include "storm/utility/resources.h" -#include "storm/utility/file.h" +#include "storm-cli-utilities/resources.h" +#include "storm/io/file.h" #include "storm-version-info/storm-version.h" #include "storm/utility/macros.h" #include "storm/utility/initialize.h" diff --git a/src/storm-cli-utilities/model-handling.h b/src/storm-cli-utilities/model-handling.h index 0a0dc28c1..31e287fed 100644 --- a/src/storm-cli-utilities/model-handling.h +++ b/src/storm-cli-utilities/model-handling.h @@ -6,7 +6,7 @@ #include "storm-parsers/api/storm-parsers.h" #include "storm/utility/SignalHandler.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/utility/macros.h" #include "storm/utility/NumberTraits.h" #include "storm/utility/Engine.h" diff --git a/src/storm/utility/resources.h b/src/storm-cli-utilities/resources.h similarity index 93% rename from src/storm/utility/resources.h rename to src/storm-cli-utilities/resources.h index 349796acd..a2e0b5ec1 100644 --- a/src/storm/utility/resources.h +++ b/src/storm-cli-utilities/resources.h @@ -1,6 +1,4 @@ -#ifndef STORM_UTILITY_RESOURCES_H_ -#define STORM_UTILITY_RESOURCES_H_ - +#pragma once #include #include #include @@ -55,5 +53,3 @@ namespace storm { } } } - -#endif /* STORM_UTILITY_RESOURCES_H_ */ diff --git a/src/storm-conv/api/storm-conv.cpp b/src/storm-conv/api/storm-conv.cpp index 14c140770..ef5b50a38 100644 --- a/src/storm-conv/api/storm-conv.cpp +++ b/src/storm-conv/api/storm-conv.cpp @@ -7,7 +7,7 @@ #include "storm/storage/jani/JaniScopeChanger.h" #include "storm/storage/jani/JSONExporter.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/api/properties.h" #include "storm/settings/SettingsManager.h" diff --git a/src/storm-counterexamples/counterexamples/PathCounterexample.cpp b/src/storm-counterexamples/counterexamples/PathCounterexample.cpp index 5d8f18762..4c046065c 100644 --- a/src/storm-counterexamples/counterexamples/PathCounterexample.cpp +++ b/src/storm-counterexamples/counterexamples/PathCounterexample.cpp @@ -1,6 +1,6 @@ #include "storm-counterexamples/counterexamples/PathCounterexample.h" -#include "storm/utility/export.h" +#include "storm/io/export.h" namespace storm { namespace counterexamples { diff --git a/src/storm-dft/modelchecker/dft/DFTASFChecker.cpp b/src/storm-dft/modelchecker/dft/DFTASFChecker.cpp index cdf9fc519..30d9bcb63 100644 --- a/src/storm-dft/modelchecker/dft/DFTASFChecker.cpp +++ b/src/storm-dft/modelchecker/dft/DFTASFChecker.cpp @@ -2,7 +2,7 @@ #include "SmtConstraint.cpp" #include -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/utility/bitoperations.h" #include "storm-parsers/parser/ExpressionCreator.h" #include "storm/solver/SmtSolver.h" diff --git a/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp b/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp index 8ca404609..00907ca7a 100644 --- a/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp +++ b/src/storm-dft/modelchecker/dft/DFTModelChecker.cpp @@ -5,7 +5,7 @@ #include "storm/builder/ParallelCompositionBuilder.h" #include "storm/exceptions/UnmetRequirementException.h" #include "storm/utility/bitoperations.h" -#include "storm/utility/DirectEncodingExporter.h" +#include "storm/io/DirectEncodingExporter.h" #include "storm/modelchecker/results/ExplicitQuantitativeCheckResult.h" #include "storm/modelchecker/results/ExplicitQualitativeCheckResult.h" #include "storm/models/ModelType.h" diff --git a/src/storm-dft/parser/DFTGalileoParser.cpp b/src/storm-dft/parser/DFTGalileoParser.cpp index b387a1a1a..9e7e5f146 100644 --- a/src/storm-dft/parser/DFTGalileoParser.cpp +++ b/src/storm-dft/parser/DFTGalileoParser.cpp @@ -11,7 +11,7 @@ #include "storm/exceptions/NotSupportedException.h" #include "storm/exceptions/WrongFormatException.h" #include "storm/utility/macros.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" namespace storm { namespace parser { diff --git a/src/storm-dft/parser/DFTJsonParser.cpp b/src/storm-dft/parser/DFTJsonParser.cpp index 0cda7ff08..a94332e37 100644 --- a/src/storm-dft/parser/DFTJsonParser.cpp +++ b/src/storm-dft/parser/DFTJsonParser.cpp @@ -10,7 +10,7 @@ #include "storm/exceptions/FileIoException.h" #include "storm/exceptions/NotSupportedException.h" #include "storm/utility/macros.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm-parsers/parser/ValueParser.h" namespace storm { diff --git a/src/storm-dft/storage/dft/DftJsonExporter.cpp b/src/storm-dft/storage/dft/DftJsonExporter.cpp index 506536ee5..63b2e8602 100644 --- a/src/storm-dft/storage/dft/DftJsonExporter.cpp +++ b/src/storm-dft/storage/dft/DftJsonExporter.cpp @@ -1,6 +1,6 @@ #include "DftJsonExporter.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/exceptions/NotSupportedException.h" #include diff --git a/src/storm-gspn/api/storm-gspn.cpp b/src/storm-gspn/api/storm-gspn.cpp index ea4faf9e0..4a7402f13 100644 --- a/src/storm-gspn/api/storm-gspn.cpp +++ b/src/storm-gspn/api/storm-gspn.cpp @@ -1,7 +1,7 @@ #include "storm-gspn/api/storm-gspn.h" #include "storm/settings/SettingsManager.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm-gspn/settings/modules/GSPNExportSettings.h" #include "storm-conv/settings/modules/JaniExportSettings.h" #include "storm-conv/api/storm-conv.h" diff --git a/src/storm-pars-cli/storm-pars.cpp b/src/storm-pars-cli/storm-pars.cpp index fbb8c5971..65c68a6c9 100644 --- a/src/storm-pars-cli/storm-pars.cpp +++ b/src/storm-pars-cli/storm-pars.cpp @@ -34,7 +34,7 @@ #include "storm/storage/StronglyConnectedComponentDecomposition.h" #include "storm/storage/SymbolicModelDescription.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/utility/initialize.h" #include "storm/utility/Stopwatch.h" #include "storm/utility/macros.h" diff --git a/src/storm-pars/api/export.h b/src/storm-pars/api/export.h index 69a6405de..43e199cce 100644 --- a/src/storm-pars/api/export.h +++ b/src/storm-pars/api/export.h @@ -1,4 +1,4 @@ -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/utility/macros.h" #include "storm/exceptions/NotSupportedException.h" #include "storm/analysis/GraphConditions.h" diff --git a/src/storm-pars/api/region.h b/src/storm-pars/api/region.h index 0ee310b39..b147b664f 100644 --- a/src/storm-pars/api/region.h +++ b/src/storm-pars/api/region.h @@ -21,7 +21,7 @@ #include "storm/environment/Environment.h" #include "storm/api/transformation.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/models/sparse/Model.h" #include "storm/exceptions/UnexpectedException.h" #include "storm/exceptions/InvalidOperationException.h" diff --git a/src/storm-pars/parser/ParameterRegionParser.cpp b/src/storm-pars/parser/ParameterRegionParser.cpp index bd2c0bef8..4c293ab54 100644 --- a/src/storm-pars/parser/ParameterRegionParser.cpp +++ b/src/storm-pars/parser/ParameterRegionParser.cpp @@ -4,7 +4,7 @@ #include "storm/utility/macros.h" #include "storm/exceptions/InvalidArgumentException.h" #include "storm/utility/constants.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" namespace storm { namespace parser { diff --git a/src/storm-parsers/parser/AtomicPropositionLabelingParser.cpp b/src/storm-parsers/parser/AtomicPropositionLabelingParser.cpp index a8afc93d7..fd18a3cb9 100644 --- a/src/storm-parsers/parser/AtomicPropositionLabelingParser.cpp +++ b/src/storm-parsers/parser/AtomicPropositionLabelingParser.cpp @@ -11,7 +11,7 @@ #include #include -#include "storm/utility/cstring.h" +#include "storm-parsers/util/cstring.h" #include "storm-parsers/parser/MappedFile.h" #include "storm/exceptions/WrongFormatException.h" #include "storm/exceptions/FileIoException.h" diff --git a/src/storm-parsers/parser/AutoParser.cpp b/src/storm-parsers/parser/AutoParser.cpp index 9e96af5e6..ecaec6293 100644 --- a/src/storm-parsers/parser/AutoParser.cpp +++ b/src/storm-parsers/parser/AutoParser.cpp @@ -12,7 +12,7 @@ #include "storm/adapters/RationalFunctionAdapter.h" -#include "storm/utility/cstring.h" +#include "storm-parsers/util/cstring.h" #include "storm/utility/OsDetection.h" namespace storm { diff --git a/src/storm-parsers/parser/DeterministicSparseTransitionParser.cpp b/src/storm-parsers/parser/DeterministicSparseTransitionParser.cpp index 1b3942dc8..146fa7811 100644 --- a/src/storm-parsers/parser/DeterministicSparseTransitionParser.cpp +++ b/src/storm-parsers/parser/DeterministicSparseTransitionParser.cpp @@ -8,7 +8,7 @@ #include #include "storm/utility/constants.h" -#include "storm/utility/cstring.h" +#include "storm-parsers/util/cstring.h" #include "storm-parsers/parser/MappedFile.h" #include "storm/exceptions/FileIoException.h" #include "storm/exceptions/WrongFormatException.h" diff --git a/src/storm-parsers/parser/DirectEncodingParser.cpp b/src/storm-parsers/parser/DirectEncodingParser.cpp index 4c17f7948..026425e5b 100644 --- a/src/storm-parsers/parser/DirectEncodingParser.cpp +++ b/src/storm-parsers/parser/DirectEncodingParser.cpp @@ -23,7 +23,7 @@ #include "storm/settings/SettingsManager.h" #include "storm/utility/constants.h" #include "storm/utility/builder.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/utility/macros.h" #include "storm/utility/SignalHandler.h" diff --git a/src/storm-parsers/parser/FormulaParser.cpp b/src/storm-parsers/parser/FormulaParser.cpp index e58bbfe70..37dad72d3 100644 --- a/src/storm-parsers/parser/FormulaParser.cpp +++ b/src/storm-parsers/parser/FormulaParser.cpp @@ -14,7 +14,7 @@ #include "storm/storage/expressions/ExpressionEvaluator.h" #include "FormulaParserGrammar.h" #include "storm/storage/expressions/ExpressionManager.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" namespace storm { namespace parser { diff --git a/src/storm-parsers/parser/ImcaMarkovAutomatonParser.cpp b/src/storm-parsers/parser/ImcaMarkovAutomatonParser.cpp index a10e3864b..e473c034d 100644 --- a/src/storm-parsers/parser/ImcaMarkovAutomatonParser.cpp +++ b/src/storm-parsers/parser/ImcaMarkovAutomatonParser.cpp @@ -2,7 +2,7 @@ #include "storm/settings/SettingsManager.h" #include "storm/settings/modules/BuildSettings.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/utility/builder.h" namespace storm { diff --git a/src/storm-parsers/parser/JaniParser.cpp b/src/storm-parsers/parser/JaniParser.cpp index e82ad294e..dc146ffdf 100644 --- a/src/storm-parsers/parser/JaniParser.cpp +++ b/src/storm-parsers/parser/JaniParser.cpp @@ -28,7 +28,7 @@ #include "storm/storage/jani/ArrayVariable.h" #include "storm/utility/macros.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" namespace storm { namespace parser { diff --git a/src/storm-parsers/parser/MappedFile.cpp b/src/storm-parsers/parser/MappedFile.cpp index d28e8e927..357a6e023 100644 --- a/src/storm-parsers/parser/MappedFile.cpp +++ b/src/storm-parsers/parser/MappedFile.cpp @@ -15,7 +15,7 @@ #include "storm/exceptions/FileIoException.h" #include "storm/utility/macros.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" namespace storm { namespace parser { diff --git a/src/storm-parsers/parser/MarkovAutomatonSparseTransitionParser.cpp b/src/storm-parsers/parser/MarkovAutomatonSparseTransitionParser.cpp index 6d25e7f15..9316735b4 100644 --- a/src/storm-parsers/parser/MarkovAutomatonSparseTransitionParser.cpp +++ b/src/storm-parsers/parser/MarkovAutomatonSparseTransitionParser.cpp @@ -5,7 +5,7 @@ #include "storm/exceptions/WrongFormatException.h" #include "storm/exceptions/FileIoException.h" #include "storm-parsers/parser/MappedFile.h" -#include "storm/utility/cstring.h" +#include "storm-parsers/util/cstring.h" #include "storm/utility/constants.h" #include "storm/utility/macros.h" diff --git a/src/storm-parsers/parser/NondeterministicSparseTransitionParser.cpp b/src/storm-parsers/parser/NondeterministicSparseTransitionParser.cpp index 0b0fbc168..170d10286 100644 --- a/src/storm-parsers/parser/NondeterministicSparseTransitionParser.cpp +++ b/src/storm-parsers/parser/NondeterministicSparseTransitionParser.cpp @@ -11,7 +11,7 @@ #include "storm/exceptions/InvalidArgumentException.h" #include "storm/exceptions/WrongFormatException.h" -#include "storm/utility/cstring.h" +#include "storm-parsers/util/cstring.h" #include "storm/adapters/RationalFunctionAdapter.h" #include "storm/utility/macros.h" diff --git a/src/storm-parsers/parser/PrismParser.cpp b/src/storm-parsers/parser/PrismParser.cpp index 0368d843c..c95c42af2 100644 --- a/src/storm-parsers/parser/PrismParser.cpp +++ b/src/storm-parsers/parser/PrismParser.cpp @@ -6,7 +6,7 @@ #include "storm/exceptions/InvalidArgumentException.h" #include "storm/exceptions/InvalidTypeException.h" #include "storm/utility/macros.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/exceptions/WrongFormatException.h" #include "storm/exceptions/UnexpectedException.h" diff --git a/src/storm-parsers/parser/ReadValues.h b/src/storm-parsers/parser/ReadValues.h index e39644867..669686222 100644 --- a/src/storm-parsers/parser/ReadValues.h +++ b/src/storm-parsers/parser/ReadValues.h @@ -1,7 +1,7 @@ #ifndef _STORM_PARSER_READVALUES_H #define _STORM_PARSER_READVALUES_H -#include "storm/utility/cstring.h" +#include "storm-parsers/util/cstring.h" namespace storm { diff --git a/src/storm-parsers/parser/SparseChoiceLabelingParser.cpp b/src/storm-parsers/parser/SparseChoiceLabelingParser.cpp index 8a741aaa5..83b7e73ce 100644 --- a/src/storm-parsers/parser/SparseChoiceLabelingParser.cpp +++ b/src/storm-parsers/parser/SparseChoiceLabelingParser.cpp @@ -5,7 +5,7 @@ #include "storm/exceptions/OutOfRangeException.h" #include "storm/exceptions/FileIoException.h" #include "storm-parsers/parser/MappedFile.h" -#include "storm/utility/cstring.h" +#include "storm-parsers/util/cstring.h" namespace storm { namespace parser { diff --git a/src/storm-parsers/parser/SparseItemLabelingParser.cpp b/src/storm-parsers/parser/SparseItemLabelingParser.cpp index 9e5e7b154..4a68c7b3e 100644 --- a/src/storm-parsers/parser/SparseItemLabelingParser.cpp +++ b/src/storm-parsers/parser/SparseItemLabelingParser.cpp @@ -4,7 +4,7 @@ #include #include -#include "storm/utility/cstring.h" +#include "storm-parsers/util/cstring.h" #include "storm-parsers/parser/MappedFile.h" #include "storm/utility/macros.h" diff --git a/src/storm-parsers/parser/SparseStateRewardParser.cpp b/src/storm-parsers/parser/SparseStateRewardParser.cpp index acb67e9fb..1bf83507a 100644 --- a/src/storm-parsers/parser/SparseStateRewardParser.cpp +++ b/src/storm-parsers/parser/SparseStateRewardParser.cpp @@ -4,7 +4,7 @@ #include "storm/exceptions/WrongFormatException.h" #include "storm/exceptions/OutOfRangeException.h" #include "storm/exceptions/FileIoException.h" -#include "storm/utility/cstring.h" +#include "storm-parsers/util/cstring.h" #include "storm-parsers/parser/MappedFile.h" #include "storm/adapters/RationalFunctionAdapter.h" diff --git a/src/storm/utility/cstring.cpp b/src/storm-parsers/util/cstring.cpp similarity index 98% rename from src/storm/utility/cstring.cpp rename to src/storm-parsers/util/cstring.cpp index 6bf69a421..5b701eb00 100644 --- a/src/storm/utility/cstring.cpp +++ b/src/storm-parsers/util/cstring.cpp @@ -1,4 +1,4 @@ -#include "storm/utility/cstring.h" +#include "storm-parsers/util/cstring.h" #include diff --git a/src/storm/utility/cstring.h b/src/storm-parsers/util/cstring.h similarity index 85% rename from src/storm/utility/cstring.h rename to src/storm-parsers/util/cstring.h index 65168e525..f61866e4a 100644 --- a/src/storm/utility/cstring.h +++ b/src/storm-parsers/util/cstring.h @@ -1,12 +1,4 @@ -/* - * cstring.h - * - * Created on: 30.01.2014 - * Author: Manuel Sascha Weiand - */ - -#ifndef STORM_UTILITY_CSTRING_H_ -#define STORM_UTILITY_CSTRING_H_ +#pragma once #include @@ -49,5 +41,3 @@ namespace storm { } // namespace cstring } // namespace utility } // namespace storm - -#endif /* STORM_UTILITY_CSTRING_H_ */ diff --git a/src/storm-pgcl-cli/storm-pgcl.cpp b/src/storm-pgcl-cli/storm-pgcl.cpp index 45b81f2c8..b1802a072 100644 --- a/src/storm-pgcl-cli/storm-pgcl.cpp +++ b/src/storm-pgcl-cli/storm-pgcl.cpp @@ -23,7 +23,7 @@ #include "storm-parsers/api/storm-parsers.h" #include "storm/storage/SymbolicModelDescription.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" /*! * Initialize the settings manager. diff --git a/src/storm-pgcl/parser/PgclParser.cpp b/src/storm-pgcl/parser/PgclParser.cpp index 2afe737be..2d8fff4a1 100755 --- a/src/storm-pgcl/parser/PgclParser.cpp +++ b/src/storm-pgcl/parser/PgclParser.cpp @@ -1,7 +1,7 @@ #include "PgclParser.h" // If the parser fails due to ill-formed data, this exception is thrown. #include "storm/exceptions/WrongFormatException.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" namespace storm { namespace parser { diff --git a/src/storm-pomdp/analysis/IterativePolicySearch.cpp b/src/storm-pomdp/analysis/IterativePolicySearch.cpp index 719def098..f41550e9a 100644 --- a/src/storm-pomdp/analysis/IterativePolicySearch.cpp +++ b/src/storm-pomdp/analysis/IterativePolicySearch.cpp @@ -1,5 +1,5 @@ #include "storm-pomdp/analysis/IterativePolicySearch.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm-pomdp/analysis/OneShotPolicySearch.h" #include "storm-pomdp/analysis/QualitativeAnalysis.h" diff --git a/src/storm-pomdp/analysis/OneShotPolicySearch.cpp b/src/storm-pomdp/analysis/OneShotPolicySearch.cpp index a39901eb4..0e2cdbe5d 100644 --- a/src/storm-pomdp/analysis/OneShotPolicySearch.cpp +++ b/src/storm-pomdp/analysis/OneShotPolicySearch.cpp @@ -1,4 +1,4 @@ -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm-pomdp/analysis/OneShotPolicySearch.h" diff --git a/src/storm-pomdp/analysis/WinningRegion.cpp b/src/storm-pomdp/analysis/WinningRegion.cpp index 7b3bed467..7b872a20a 100644 --- a/src/storm-pomdp/analysis/WinningRegion.cpp +++ b/src/storm-pomdp/analysis/WinningRegion.cpp @@ -1,7 +1,7 @@ #include #include #include -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/utility/constants.h" #include "storm/storage/expressions/Expression.h" #include "storm/storage/expressions/ExpressionManager.h" diff --git a/src/storm/abstraction/MenuGameAbstractor.cpp b/src/storm/abstraction/MenuGameAbstractor.cpp index d75a8ddb4..25d008292 100644 --- a/src/storm/abstraction/MenuGameAbstractor.cpp +++ b/src/storm/abstraction/MenuGameAbstractor.cpp @@ -10,7 +10,7 @@ #include "storm/storage/dd/Add.h" #include "storm/storage/dd/Bdd.h" #include "storm/utility/dd.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm-config.h" #include "storm/adapters/RationalFunctionAdapter.h" diff --git a/src/storm/adapters/EigenAdapter.h b/src/storm/adapters/EigenAdapter.h index 8f7be92ee..6d00a6539 100644 --- a/src/storm/adapters/EigenAdapter.h +++ b/src/storm/adapters/EigenAdapter.h @@ -2,7 +2,7 @@ #include -#include "storm/utility/eigen.h" +#include "storm/adapters/eigen.h" #include "storm/adapters/RationalFunctionAdapter.h" #include "storm/storage/SparseMatrix.h" diff --git a/src/storm/adapters/GmmxxAdapter.h b/src/storm/adapters/GmmxxAdapter.h index a5e139db0..022f43d0c 100644 --- a/src/storm/adapters/GmmxxAdapter.h +++ b/src/storm/adapters/GmmxxAdapter.h @@ -2,7 +2,7 @@ #include -#include "storm/utility/gmm.h" +#include "storm/adapters/gmm.h" #include "storm/storage/SparseMatrix.h" diff --git a/src/storm/utility/eigen.h b/src/storm/adapters/eigen.h similarity index 100% rename from src/storm/utility/eigen.h rename to src/storm/adapters/eigen.h diff --git a/src/storm/utility/gmm.h b/src/storm/adapters/gmm.h similarity index 100% rename from src/storm/utility/gmm.h rename to src/storm/adapters/gmm.h diff --git a/src/storm/utility/sylvan.cpp b/src/storm/adapters/sylvan.cpp similarity index 93% rename from src/storm/utility/sylvan.cpp rename to src/storm/adapters/sylvan.cpp index 769b125d2..b055f9db2 100644 --- a/src/storm/utility/sylvan.cpp +++ b/src/storm/adapters/sylvan.cpp @@ -1,4 +1,4 @@ -#include "storm/utility/sylvan.h" +#include "storm/adapters/sylvan.h" namespace storm { namespace dd { diff --git a/src/storm/utility/sylvan.h b/src/storm/adapters/sylvan.h similarity index 100% rename from src/storm/utility/sylvan.h rename to src/storm/adapters/sylvan.h diff --git a/src/storm/api/export.h b/src/storm/api/export.h index e72496c39..e0d0fdf2a 100644 --- a/src/storm/api/export.h +++ b/src/storm/api/export.h @@ -2,9 +2,9 @@ #include "storm/settings/SettingsManager.h" -#include "storm/utility/DirectEncodingExporter.h" -#include "storm/utility/DDEncodingExporter.h" -#include "storm/utility/file.h" +#include "storm/io/DirectEncodingExporter.h" +#include "storm/io/DDEncodingExporter.h" +#include "storm/io/file.h" #include "storm/utility/macros.h" #include "storm/storage/Scheduler.h" diff --git a/src/storm/utility/DDEncodingExporter.cpp b/src/storm/io/DDEncodingExporter.cpp similarity index 96% rename from src/storm/utility/DDEncodingExporter.cpp rename to src/storm/io/DDEncodingExporter.cpp index 7ad4c303c..90278a683 100644 --- a/src/storm/utility/DDEncodingExporter.cpp +++ b/src/storm/io/DDEncodingExporter.cpp @@ -1,5 +1,5 @@ -#include "storm/utility/DDEncodingExporter.h" -#include "storm/utility/file.h" +#include "storm/io/DDEncodingExporter.h" +#include "storm/io/file.h" #include "storm/models/symbolic/StandardRewardModel.h" namespace storm { diff --git a/src/storm/utility/DDEncodingExporter.h b/src/storm/io/DDEncodingExporter.h similarity index 100% rename from src/storm/utility/DDEncodingExporter.h rename to src/storm/io/DDEncodingExporter.h diff --git a/src/storm/utility/DirectEncodingExporter.cpp b/src/storm/io/DirectEncodingExporter.cpp similarity index 99% rename from src/storm/utility/DirectEncodingExporter.cpp rename to src/storm/io/DirectEncodingExporter.cpp index f4798bc0d..495ed2cf3 100644 --- a/src/storm/utility/DirectEncodingExporter.cpp +++ b/src/storm/io/DirectEncodingExporter.cpp @@ -1,5 +1,5 @@ #include -#include "DirectEncodingExporter.h" +#include "storm/io/DirectEncodingExporter.h" #include "storm/adapters/RationalFunctionAdapter.h" #include "storm/utility/constants.h" diff --git a/src/storm/utility/DirectEncodingExporter.h b/src/storm/io/DirectEncodingExporter.h similarity index 100% rename from src/storm/utility/DirectEncodingExporter.h rename to src/storm/io/DirectEncodingExporter.h diff --git a/src/storm/utility/export.h b/src/storm/io/export.h similarity index 98% rename from src/storm/utility/export.h rename to src/storm/io/export.h index f067f88b3..1a3dbd3fe 100644 --- a/src/storm/utility/export.h +++ b/src/storm/io/export.h @@ -5,7 +5,7 @@ #include #include "storm/utility/macros.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" namespace storm { diff --git a/src/storm/utility/file.h b/src/storm/io/file.h similarity index 100% rename from src/storm/utility/file.h rename to src/storm/io/file.h diff --git a/src/storm/modelchecker/multiobjective/deterministicScheds/DeterministicSchedsParetoExplorer.cpp b/src/storm/modelchecker/multiobjective/deterministicScheds/DeterministicSchedsParetoExplorer.cpp index c1a6ff492..90a2aed8e 100644 --- a/src/storm/modelchecker/multiobjective/deterministicScheds/DeterministicSchedsParetoExplorer.cpp +++ b/src/storm/modelchecker/multiobjective/deterministicScheds/DeterministicSchedsParetoExplorer.cpp @@ -16,7 +16,7 @@ #include "storm/settings/SettingsManager.h" #include "storm/settings/modules/CoreSettings.h" -#include "storm/utility/export.h" +#include "storm/io/export.h" #include "storm/utility/solver.h" #include "storm/exceptions/UnexpectedException.h" diff --git a/src/storm/modelchecker/multiobjective/pcaa/RewardBoundedMdpPcaaWeightVectorChecker.cpp b/src/storm/modelchecker/multiobjective/pcaa/RewardBoundedMdpPcaaWeightVectorChecker.cpp index fee359020..bd8215448 100644 --- a/src/storm/modelchecker/multiobjective/pcaa/RewardBoundedMdpPcaaWeightVectorChecker.cpp +++ b/src/storm/modelchecker/multiobjective/pcaa/RewardBoundedMdpPcaaWeightVectorChecker.cpp @@ -21,7 +21,7 @@ #include "storm/solver/LinearEquationSolver.h" #include "storm/utility/ProgressMeasurement.h" #include "storm/utility/SignalHandler.h" -#include "storm/utility/export.h" +#include "storm/io/export.h" #include "storm/utility/macros.h" #include "storm/utility/vector.h" diff --git a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp index 559e0189f..a97905f7d 100644 --- a/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp +++ b/src/storm/modelchecker/multiobjective/pcaa/SparsePcaaQuery.cpp @@ -10,7 +10,7 @@ #include "storm/storage/geometry/Hyperrectangle.h" #include "storm/utility/constants.h" #include "storm/utility/vector.h" -#include "storm/utility/export.h" +#include "storm/io/export.h" #include "storm/exceptions/UnexpectedException.h" diff --git a/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp index b1ec53e30..bf9c9b9ad 100644 --- a/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp +++ b/src/storm/modelchecker/prctl/helper/SparseDtmcPrctlHelper.cpp @@ -29,7 +29,7 @@ #include "storm/utility/Stopwatch.h" #include "storm/utility/ProgressMeasurement.h" #include "storm/utility/SignalHandler.h" -#include "storm/utility/export.h" +#include "storm/io/export.h" #include "storm/utility/macros.h" #include "storm/utility/ConstantsComparator.h" diff --git a/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp b/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp index 1e9722d7a..3b69fa62d 100644 --- a/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp +++ b/src/storm/modelchecker/prctl/helper/SparseMdpPrctlHelper.cpp @@ -33,7 +33,7 @@ #include "storm/utility/Stopwatch.h" #include "storm/utility/ProgressMeasurement.h" #include "storm/utility/SignalHandler.h" -#include "storm/utility/export.h" +#include "storm/io/export.h" #include "storm/utility/NumberTraits.h" #include "storm/transformer/EndComponentEliminator.h" diff --git a/src/storm/models/sparse/DeterministicModel.cpp b/src/storm/models/sparse/DeterministicModel.cpp index 06419a6c0..ddcf7aead 100644 --- a/src/storm/models/sparse/DeterministicModel.cpp +++ b/src/storm/models/sparse/DeterministicModel.cpp @@ -3,7 +3,7 @@ #include "storm/adapters/RationalFunctionAdapter.h" #include "storm/models/sparse/StandardRewardModel.h" #include "storm/utility/constants.h" -#include "storm/utility/export.h" +#include "storm/io/export.h" namespace storm { namespace models { diff --git a/src/storm/models/sparse/Model.cpp b/src/storm/models/sparse/Model.cpp index b0137feda..bf9d69d4c 100644 --- a/src/storm/models/sparse/Model.cpp +++ b/src/storm/models/sparse/Model.cpp @@ -9,7 +9,7 @@ #include "storm/models/sparse/MarkovAutomaton.h" #include "storm/models/sparse/StandardRewardModel.h" #include "storm/utility/vector.h" -#include "storm/utility/export.h" +#include "storm/io/export.h" #include "storm/utility/NumberTraits.h" diff --git a/src/storm/models/sparse/NondeterministicModel.cpp b/src/storm/models/sparse/NondeterministicModel.cpp index 635cfee7b..2c882464e 100644 --- a/src/storm/models/sparse/NondeterministicModel.cpp +++ b/src/storm/models/sparse/NondeterministicModel.cpp @@ -8,7 +8,7 @@ #include "storm/storage/memorystructure/MemoryStructureBuilder.h" #include "storm/storage/memorystructure/SparseModelMemoryProduct.h" #include "storm/transformer/SubsystemBuilder.h" -#include "storm/utility/export.h" +#include "storm/io/export.h" namespace storm { namespace models { diff --git a/src/storm/settings/SettingsManager.cpp b/src/storm/settings/SettingsManager.cpp index 027a24df6..4c797e524 100644 --- a/src/storm/settings/SettingsManager.cpp +++ b/src/storm/settings/SettingsManager.cpp @@ -42,7 +42,7 @@ #include "storm/settings/modules/HintSettings.h" #include "storm/settings/modules/OviSolverSettings.h" #include "storm/utility/macros.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/utility/string.h" #include "storm/settings/Option.h" diff --git a/src/storm/solver/EigenLinearEquationSolver.h b/src/storm/solver/EigenLinearEquationSolver.h index 32697b615..e2d246665 100644 --- a/src/storm/solver/EigenLinearEquationSolver.h +++ b/src/storm/solver/EigenLinearEquationSolver.h @@ -2,7 +2,7 @@ #include "storm/solver/LinearEquationSolver.h" #include "storm/solver/SolverSelectionOptions.h" -#include "storm/utility/eigen.h" +#include "storm/adapters/eigen.h" namespace storm { namespace solver { diff --git a/src/storm/solver/GmmxxLinearEquationSolver.cpp b/src/storm/solver/GmmxxLinearEquationSolver.cpp index 9142ba1d6..1f954426e 100644 --- a/src/storm/solver/GmmxxLinearEquationSolver.cpp +++ b/src/storm/solver/GmmxxLinearEquationSolver.cpp @@ -7,7 +7,7 @@ #include "storm/environment/solver/GmmxxSolverEnvironment.h" #include "storm/exceptions/AbortException.h" #include "storm/utility/constants.h" -#include "storm/utility/gmm.h" +#include "storm/adapters/gmm.h" #include "storm/utility/vector.h" #include "storm/utility/SignalHandler.h" diff --git a/src/storm/solver/GmmxxLinearEquationSolver.h b/src/storm/solver/GmmxxLinearEquationSolver.h index f288e9f58..e9b11656d 100644 --- a/src/storm/solver/GmmxxLinearEquationSolver.h +++ b/src/storm/solver/GmmxxLinearEquationSolver.h @@ -3,7 +3,7 @@ #include -#include "storm/utility/gmm.h" +#include "storm/adapters/gmm.h" #include "storm/solver/LinearEquationSolver.h" #include "storm/solver/SolverSelectionOptions.h" diff --git a/src/storm/solver/SmtlibSmtSolver.cpp b/src/storm/solver/SmtlibSmtSolver.cpp index 1ef7fda76..1cd716f33 100644 --- a/src/storm/solver/SmtlibSmtSolver.cpp +++ b/src/storm/solver/SmtlibSmtSolver.cpp @@ -17,7 +17,7 @@ #include "storm/exceptions/IllegalArgumentException.h" #include "storm/exceptions/IllegalFunctionCallException.h" #include "storm/utility/macros.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/adapters/RationalFunctionAdapter.h" #include "storm/exceptions/UnexpectedException.h" diff --git a/src/storm/solver/Z3LpSolver.cpp b/src/storm/solver/Z3LpSolver.cpp index 4c2baf05c..3c34cdac1 100644 --- a/src/storm/solver/Z3LpSolver.cpp +++ b/src/storm/solver/Z3LpSolver.cpp @@ -9,7 +9,7 @@ #include "storm/utility/macros.h" #include "storm/utility/constants.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/storage/expressions/Expression.h" #include "storm/storage/expressions/ExpressionManager.h" diff --git a/src/storm/storage/Qvbs.cpp b/src/storm/storage/Qvbs.cpp index 71c012568..15a4494be 100644 --- a/src/storm/storage/Qvbs.cpp +++ b/src/storm/storage/Qvbs.cpp @@ -3,7 +3,7 @@ #include #include "storm/utility/macros.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/utility/string.h" #include "storm/settings/SettingsManager.h" #include "storm/settings/modules/IOSettings.h" diff --git a/src/storm/storage/dd/Odd.cpp b/src/storm/storage/dd/Odd.cpp index 10fd878a9..d48ed2060 100644 --- a/src/storm/storage/dd/Odd.cpp +++ b/src/storm/storage/dd/Odd.cpp @@ -8,7 +8,7 @@ #include "storm/utility/macros.h" #include "storm/exceptions/InvalidArgumentException.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/adapters/RationalFunctionAdapter.h" #include "storm/exceptions/NotSupportedException.h" diff --git a/src/storm/storage/dd/sylvan/InternalSylvanBdd.h b/src/storm/storage/dd/sylvan/InternalSylvanBdd.h index 0dadbf8a4..bd1ee3db1 100644 --- a/src/storm/storage/dd/sylvan/InternalSylvanBdd.h +++ b/src/storm/storage/dd/sylvan/InternalSylvanBdd.h @@ -13,7 +13,7 @@ #include "storm/storage/dd/InternalBdd.h" #include "storm/storage/dd/InternalAdd.h" -#include "storm/utility/sylvan.h" +#include "storm/adapters/sylvan.h" namespace storm { namespace storage { diff --git a/src/storm/storage/dd/sylvan/InternalSylvanDdManager.cpp b/src/storm/storage/dd/sylvan/InternalSylvanDdManager.cpp index 2b8a549cf..4bc73632c 100644 --- a/src/storm/storage/dd/sylvan/InternalSylvanDdManager.cpp +++ b/src/storm/storage/dd/sylvan/InternalSylvanDdManager.cpp @@ -11,7 +11,7 @@ #include "storm/exceptions/NotSupportedException.h" #include "storm/exceptions/InvalidSettingsException.h" -#include "storm/utility/sylvan.h" +#include "storm/adapters/sylvan.h" #include "storm-config.h" diff --git a/src/storm/storage/dd/sylvan/SylvanAddIterator.h b/src/storm/storage/dd/sylvan/SylvanAddIterator.h index e19d04fe9..f28673d0a 100644 --- a/src/storm/storage/dd/sylvan/SylvanAddIterator.h +++ b/src/storm/storage/dd/sylvan/SylvanAddIterator.h @@ -6,7 +6,7 @@ #include "storm/storage/dd/AddIterator.h" #include "storm/storage/expressions/SimpleValuation.h" -#include "storm/utility/sylvan.h" +#include "storm/adapters/sylvan.h" namespace storm { namespace dd { diff --git a/src/storm/storage/dd/sylvan/utility.h b/src/storm/storage/dd/sylvan/utility.h index 02a06a3bf..a33e02c57 100644 --- a/src/storm/storage/dd/sylvan/utility.h +++ b/src/storm/storage/dd/sylvan/utility.h @@ -1,6 +1,6 @@ #pragma once -#include "storm/utility/sylvan.h" +#include "storm/adapters/sylvan.h" #include diff --git a/src/storm/storage/expressions/Type.cpp b/src/storm/storage/expressions/Type.cpp index b585b8eae..bc92c859a 100644 --- a/src/storm/storage/expressions/Type.cpp +++ b/src/storm/storage/expressions/Type.cpp @@ -210,7 +210,7 @@ namespace storm { } Type Type::divide(Type const& other) const { - STORM_LOG_THROW(this->isNumericalType() && other.isNumericalType(), storm::exceptions::InvalidTypeException, "Operator requires numerical operands."); + STORM_LOG_THROW(this->isNumericalType() && other.isNumericalType(), storm::exceptions::InvalidTypeException, "Operator division requires numerical operands, got " << this->isNumericalType() << " and " << other.isNumericalType() << "." ); STORM_LOG_THROW(!this->isBitVectorType() && !other.isBitVectorType(), storm::exceptions::InvalidTypeException, "Operator requires non-bitvector operands."); return std::max(*this, other); } diff --git a/src/storm/storage/geometry/nativepolytopeconversion/SubsetEnumerator.cpp b/src/storm/storage/geometry/nativepolytopeconversion/SubsetEnumerator.cpp index 709fe4f6f..2d9606029 100644 --- a/src/storm/storage/geometry/nativepolytopeconversion/SubsetEnumerator.cpp +++ b/src/storm/storage/geometry/nativepolytopeconversion/SubsetEnumerator.cpp @@ -2,7 +2,7 @@ #include "storm/adapters/RationalFunctionAdapter.h" -#include "storm/utility/eigen.h" +#include "storm/adapters/eigen.h" namespace storm { namespace storage { diff --git a/src/storm/storage/jani/JSONExporter.cpp b/src/storm/storage/jani/JSONExporter.cpp index 46317c870..79748e5da 100644 --- a/src/storm/storage/jani/JSONExporter.cpp +++ b/src/storm/storage/jani/JSONExporter.cpp @@ -5,7 +5,7 @@ #include #include "storm/utility/macros.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" #include "storm/exceptions/FileIoException.h" #include "storm/exceptions/NotSupportedException.h" diff --git a/src/test/storm/parser/MappedFileTest.cpp b/src/test/storm/parser/MappedFileTest.cpp index 14b1cbf33..69127e8d0 100644 --- a/src/test/storm/parser/MappedFileTest.cpp +++ b/src/test/storm/parser/MappedFileTest.cpp @@ -10,8 +10,8 @@ #include #include "storm-parsers/parser/MappedFile.h" -#include "storm/utility/cstring.h" -#include "storm/utility/file.h" +#include "storm-parsers/util/cstring.h" +#include "storm/io/file.h" #include "storm/exceptions/FileIoException.h" TEST(MappedFileTest, NonExistingFile) { diff --git a/src/test/storm/parser/MarkovAutomatonSparseTransitionParserTest.cpp b/src/test/storm/parser/MarkovAutomatonSparseTransitionParserTest.cpp index 030d1b07b..d1f1867d9 100644 --- a/src/test/storm/parser/MarkovAutomatonSparseTransitionParserTest.cpp +++ b/src/test/storm/parser/MarkovAutomatonSparseTransitionParserTest.cpp @@ -13,7 +13,7 @@ #include #include "storm-parsers/parser/MarkovAutomatonSparseTransitionParser.h" -#include "storm/utility/cstring.h" +#include "storm-parsers/util/cstring.h" #include "storm-parsers/parser/MarkovAutomatonParser.h" #include "storm/settings/SettingMemento.h" #include "storm/exceptions/WrongFormatException.h" diff --git a/src/test/storm/utility/FileTest.cpp b/src/test/storm/utility/FileTest.cpp index d804e653e..0150ad677 100644 --- a/src/test/storm/utility/FileTest.cpp +++ b/src/test/storm/utility/FileTest.cpp @@ -1,7 +1,7 @@ #include "test/storm_gtest.h" #include "storm-config.h" -#include "storm/utility/file.h" +#include "storm/io/file.h" TEST(FileTest, GetLine) { std::stringstream stream;