refactoring: moving some code out of the util folder

5 years ago · d6bfcb4818
77 changed files with 76 additions and 90 deletions
--- 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"
--- 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"
--- a/src/storm-cli-utilities/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 <sys/time.h>
 #include <sys/times.h>
 #include <sys/resource.h>
@ -55,5 +53,3 @@ namespace storm {
        }
    }
 }
-
-#endif /* STORM_UTILITY_RESOURCES_H_ */
--- 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"
--- 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 {
--- a/src/storm-dft/modelchecker/dft/DFTASFChecker.cpp
+++ b/src/storm-dft/modelchecker/dft/DFTASFChecker.cpp
@ -2,7 +2,7 @@
 #include "SmtConstraint.cpp"
 #include <string>

-#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"
--- 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"
--- 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 {
--- 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 {
--- 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 <algorithm>
--- 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"
--- 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"
--- 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"
--- 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"
--- 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 {
--- a/src/storm-parsers/parser/AtomicPropositionLabelingParser.cpp
+++ b/src/storm-parsers/parser/AtomicPropositionLabelingParser.cpp
@ -11,7 +11,7 @@
 #include <string>
 #include <iostream>

-#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"
--- 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 {
--- a/src/storm-parsers/parser/DeterministicSparseTransitionParser.cpp
+++ b/src/storm-parsers/parser/DeterministicSparseTransitionParser.cpp
@ -8,7 +8,7 @@
 #include <string>

 #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"
--- 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"

--- 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 {
--- 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 {
--- 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 {
--- 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 {
--- 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"

--- 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"
--- 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"

--- 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
 {
--- 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 {
--- a/src/storm-parsers/parser/SparseItemLabelingParser.cpp
+++ b/src/storm-parsers/parser/SparseItemLabelingParser.cpp
@ -4,7 +4,7 @@
 #include <string>
 #include <iostream>

-#include "storm/utility/cstring.h"
+#include "storm-parsers/util/cstring.h"
 #include "storm-parsers/parser/MappedFile.h"

 #include "storm/utility/macros.h"
--- 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"
--- a/src/storm-parsers/util/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 <cstring>

--- a/src/storm-parsers/util/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 <cstdint>

@ -49,5 +41,3 @@ namespace storm {
 		} // namespace cstring
 	} // namespace utility
 } // namespace storm
-
-#endif /* STORM_UTILITY_CSTRING_H_ */
--- 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.
--- 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 {
--- 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"
--- 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"

--- a/src/storm-pomdp/analysis/WinningRegion.cpp
+++ b/src/storm-pomdp/analysis/WinningRegion.cpp
@ -1,7 +1,7 @@
 #include <iostream>
 #include <boost/algorithm/string.hpp>
 #include <storm/exceptions/WrongFormatException.h>
-#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"
--- 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"
--- a/src/storm/adapters/EigenAdapter.h
+++ b/src/storm/adapters/EigenAdapter.h
@ -2,7 +2,7 @@

 #include <memory>

-#include "storm/utility/eigen.h"
+#include "storm/adapters/eigen.h"
 #include "storm/adapters/RationalFunctionAdapter.h"

 #include "storm/storage/SparseMatrix.h"
--- a/src/storm/adapters/GmmxxAdapter.h
+++ b/src/storm/adapters/GmmxxAdapter.h
@ -2,7 +2,7 @@

 #include <memory>

-#include "storm/utility/gmm.h"
+#include "storm/adapters/gmm.h"

 #include "storm/storage/SparseMatrix.h"

--- a/src/storm/adapters/eigen.h
+++ b/src/storm/adapters/eigen.h
--- a/src/storm/adapters/gmm.h
+++ b/src/storm/adapters/gmm.h
--- a/src/storm/adapters/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 {
--- a/src/storm/adapters/sylvan.h
+++ b/src/storm/adapters/sylvan.h
--- 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"

--- a/src/storm/utility/DDEncodingExporter.cpp
+++ b/src/storm/utility/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 {
--- a/src/storm/utility/DDEncodingExporter.h
+++ b/src/storm/utility/DDEncodingExporter.h
--- a/src/storm/utility/DirectEncodingExporter.cpp
+++ b/src/storm/utility/DirectEncodingExporter.cpp
@ -1,5 +1,5 @@
 #include <storm/exceptions/NotSupportedException.h>
-#include "DirectEncodingExporter.h"
+#include "storm/io/DirectEncodingExporter.h"

 #include "storm/adapters/RationalFunctionAdapter.h"
 #include "storm/utility/constants.h"
--- a/src/storm/utility/DirectEncodingExporter.h
+++ b/src/storm/utility/DirectEncodingExporter.h
--- a/src/storm/utility/export.h
+++ b/src/storm/utility/export.h
@ -5,7 +5,7 @@
 #include <boost/optional.hpp>

 #include "storm/utility/macros.h"
-#include "storm/utility/file.h"
+#include "storm/io/file.h"


 namespace storm {
--- a/src/storm/utility/file.h
+++ b/src/storm/utility/file.h
--- 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"
--- 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"

--- 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"

--- 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"
--- 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"
--- 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 {
--- 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"


--- 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 {
--- 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"

--- 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 {
--- 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"

--- a/src/storm/solver/GmmxxLinearEquationSolver.h
+++ b/src/storm/solver/GmmxxLinearEquationSolver.h
@ -3,7 +3,7 @@

 #include <ostream>

-#include "storm/utility/gmm.h"
+#include "storm/adapters/gmm.h"

 #include "storm/solver/LinearEquationSolver.h"
 #include "storm/solver/SolverSelectionOptions.h"
--- 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"

--- 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"

--- a/src/storm/storage/Qvbs.cpp
+++ b/src/storm/storage/Qvbs.cpp
@ -3,7 +3,7 @@
 #include <algorithm>

 #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"
--- 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"
--- 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 {
--- 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"

--- 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 {
--- 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 <boost/functional/hash.hpp>

--- 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);
        }
--- 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 {
--- a/src/storm/storage/jani/JSONExporter.cpp
+++ b/src/storm/storage/jani/JSONExporter.cpp
@ -5,7 +5,7 @@
 #include <vector>

 #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"

--- a/src/test/storm/parser/MappedFileTest.cpp
+++ b/src/test/storm/parser/MappedFileTest.cpp
@ -10,8 +10,8 @@

 #include <string>
 #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) {
--- a/src/test/storm/parser/MarkovAutomatonSparseTransitionParserTest.cpp
+++ b/src/test/storm/parser/MarkovAutomatonSparseTransitionParserTest.cpp
@ -13,7 +13,7 @@
 #include <vector>

 #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"
--- 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;