Fixed merge errors and adapted to changes in master

Former-commit-id: 08054e7bec

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<ValueType>());
+					dependencyGraphBuilder.addNextValue(currentBlockIndex, targetBlock, storm::utility::one<ValueType>());
 				}
 			}
 

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();

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<double>;
-        
-        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<double>;
 
-        template double simplify(double value);
+		template double one();
+		template double zero();
+		template double infinity();
 
-        template storm::storage::MatrixEntry<storm::storage::sparse::state_type, double> simplify(storm::storage::MatrixEntry<storm::storage::sparse::state_type, double> matrixEntry);
-        template storm::storage::MatrixEntry<storm::storage::sparse::state_type, double>& simplify(storm::storage::MatrixEntry<storm::storage::sparse::state_type, double>& matrixEntry);
-        template storm::storage::MatrixEntry<storm::storage::sparse::state_type, double>&& simplify(storm::storage::MatrixEntry<storm::storage::sparse::state_type, double>&& matrixEntry);
-        
+		template double pow(double const& value, uint_fast64_t exponent);
+
+		template double simplify(double value);
+
+		template storm::storage::MatrixEntry<storm::storage::sparse::state_type, double> simplify(storm::storage::MatrixEntry<storm::storage::sparse::state_type, double> matrixEntry);
+		template storm::storage::MatrixEntry<storm::storage::sparse::state_type, double>& simplify(storm::storage::MatrixEntry<storm::storage::sparse::state_type, double>& matrixEntry);
+		template storm::storage::MatrixEntry<storm::storage::sparse::state_type, double>&& simplify(storm::storage::MatrixEntry<storm::storage::sparse::state_type, double>&& matrixEntry);
+
+		//float
+		template class ConstantsComparator<float>;
+
+		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<storm::storage::sparse::state_type, float> simplify(storm::storage::MatrixEntry<storm::storage::sparse::state_type, float> matrixEntry);
+		template storm::storage::MatrixEntry<storm::storage::sparse::state_type, float>& simplify(storm::storage::MatrixEntry<storm::storage::sparse::state_type, float>& matrixEntry);
+		template storm::storage::MatrixEntry<storm::storage::sparse::state_type, float>&& simplify(storm::storage::MatrixEntry<storm::storage::sparse::state_type, float>&& matrixEntry);
+
+		//int
         template class ConstantsComparator<int>;
         
         template int one();

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"