From b623384dda48d5c5530baf62f48367e69ed16ee9 Mon Sep 17 00:00:00 2001 From: David_Korzeniewski Date: Fri, 20 Feb 2015 12:49:34 +0100 Subject: [PATCH] Fixed merge errors and adapted to changes in master Former-commit-id: 08054e7bec9c950a138deb3108366003250abfc1 --- src/models/PseudoModel.cpp | 2 +- src/settings/modules/GeneralSettings.cpp | 4 -- src/utility/constants.cpp | 63 +++++++++++++------ ...ValueIterationMdpPrctlModelCheckerTest.cpp | 2 +- 4 files changed, 46 insertions(+), 25 deletions(-) diff --git a/src/models/PseudoModel.cpp b/src/models/PseudoModel.cpp index 1d3fecf43..500c71c1e 100644 --- a/src/models/PseudoModel.cpp +++ b/src/models/PseudoModel.cpp @@ -91,7 +91,7 @@ namespace storm { // Now we can just enumerate all the target SCCs and insert the corresponding transitions. for (auto targetBlock : allTargetBlocks) { - dependencyGraphBuilder.addNextValue(currentBlockIndex, targetBlock, storm::utility::constantOne()); + dependencyGraphBuilder.addNextValue(currentBlockIndex, targetBlock, storm::utility::one()); } } diff --git a/src/settings/modules/GeneralSettings.cpp b/src/settings/modules/GeneralSettings.cpp index b5e44a5c7..e8f64ac9f 100644 --- a/src/settings/modules/GeneralSettings.cpp +++ b/src/settings/modules/GeneralSettings.cpp @@ -269,10 +269,6 @@ namespace storm { return true; } - - bool GeneralSettings::isBisimulationSet() const { - return this->getOption(bisimulationOptionName).getHasOptionBeenSet(); - } bool GeneralSettings::isCudaSet() const { return this->getOption(cudaOptionName).getHasOptionBeenSet(); diff --git a/src/utility/constants.cpp b/src/utility/constants.cpp index 231205ae7..2967cb5cb 100644 --- a/src/utility/constants.cpp +++ b/src/utility/constants.cpp @@ -33,13 +33,20 @@ namespace storm { ValueType pow(ValueType const& value, uint_fast64_t exponent) { return std::pow(value, exponent); } - - template<> - double simplify(double value) { - // In the general case, we don't to anything here, but merely return the value. If something else is - // supposed to happen here, the templated function can be specialized for this particular type. - return value; - } + + template<> + double simplify(double value) { + // In the general case, we don't to anything here, but merely return the value. If something else is + // supposed to happen here, the templated function can be specialized for this particular type. + return value; + } + + template<> + float simplify(float value) { + // In the general case, we don't to anything here, but merely return the value. If something else is + // supposed to happen here, the templated function can be specialized for this particular type. + return value; + } template<> int simplify(int value) { @@ -162,20 +169,38 @@ namespace storm { return std::move(matrixEntry); } - template class ConstantsComparator; - - template double one(); - template double zero(); - template double infinity(); - - template double pow(double const& value, uint_fast64_t exponent); + //explicit instantiations + //double + template class ConstantsComparator; - template double simplify(double value); + template double one(); + template double zero(); + template double infinity(); - template storm::storage::MatrixEntry simplify(storm::storage::MatrixEntry matrixEntry); - template storm::storage::MatrixEntry& simplify(storm::storage::MatrixEntry& matrixEntry); - template storm::storage::MatrixEntry&& simplify(storm::storage::MatrixEntry&& matrixEntry); - + template double pow(double const& value, uint_fast64_t exponent); + + template double simplify(double value); + + template storm::storage::MatrixEntry simplify(storm::storage::MatrixEntry matrixEntry); + template storm::storage::MatrixEntry& simplify(storm::storage::MatrixEntry& matrixEntry); + template storm::storage::MatrixEntry&& simplify(storm::storage::MatrixEntry&& matrixEntry); + + //float + template class ConstantsComparator; + + template float one(); + template float zero(); + template float infinity(); + + template float pow(float const& value, uint_fast64_t exponent); + + template float simplify(float value); + + template storm::storage::MatrixEntry simplify(storm::storage::MatrixEntry matrixEntry); + template storm::storage::MatrixEntry& simplify(storm::storage::MatrixEntry& matrixEntry); + template storm::storage::MatrixEntry&& simplify(storm::storage::MatrixEntry&& matrixEntry); + + //int template class ConstantsComparator; template int one(); diff --git a/test/functional/modelchecker/TopologicalValueIterationMdpPrctlModelCheckerTest.cpp b/test/functional/modelchecker/TopologicalValueIterationMdpPrctlModelCheckerTest.cpp index d5acb6d9c..d656ad9e4 100644 --- a/test/functional/modelchecker/TopologicalValueIterationMdpPrctlModelCheckerTest.cpp +++ b/test/functional/modelchecker/TopologicalValueIterationMdpPrctlModelCheckerTest.cpp @@ -6,7 +6,7 @@ #include "src/solver/NativeNondeterministicLinearEquationSolver.h" #include "src/modelchecker/prctl/TopologicalValueIterationMdpPrctlModelChecker.h" #include "src/modelchecker/prctl/SparseMdpPrctlModelChecker.h" -#include "src/modelchecker/ExplicitQuantitativeCheckResult.h" +#include "src/modelchecker/results/ExplicitQuantitativeCheckResult.h" #include "src/settings/SettingsManager.h" #include "src/settings/SettingMemento.h" #include "src/parser/AutoParser.h"