From 1dccab9673bc018345cc09a3f603d20b8572e403 Mon Sep 17 00:00:00 2001
From: Tim Quatmann <tim.quatmann@cs.rwth-aachen.de>
Date: Fri, 13 Mar 2020 18:46:52 +0100
Subject: [PATCH] JaniParser: Added missing template instantiation and other
 fixes.

---
 src/storm-parsers/parser/JaniParser.cpp | 4 ++--
 src/storm-parsers/parser/JaniParser.h   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/storm-parsers/parser/JaniParser.cpp b/src/storm-parsers/parser/JaniParser.cpp
index 6400818fe..e82ad294e 100644
--- a/src/storm-parsers/parser/JaniParser.cpp
+++ b/src/storm-parsers/parser/JaniParser.cpp
@@ -41,7 +41,7 @@ namespace storm {
         template <typename ValueType>
         const bool JaniParser<ValueType>::defaultBooleanInitialValue = false;
         template <typename ValueType>
-        const double JaniParser<ValueType>::defaultRationalInitialValue = storm::utility::zero<ValueType>();
+        const ValueType JaniParser<ValueType>::defaultRationalInitialValue = storm::utility::zero<ValueType>();
         template <typename ValueType>
         const int64_t JaniParser<ValueType>::defaultIntegerInitialValue = 0;
         const std::string VARIABLE_AUTOMATON_DELIMITER = "_";
@@ -1061,7 +1061,7 @@ namespace storm {
             } else if (expressionStructure.is_number_integer()) {
                 return expressionManager->integer(expressionStructure.template get<int64_t>());
             } else if (expressionStructure.is_number_float()) {
-                return expressionManager->rational(storm::utility::convertNumber<storm::RationalNumber>(expressionStructure.dump()));
+                return expressionManager->rational(storm::utility::convertNumber<storm::RationalNumber>(expressionStructure.template get<ValueType>()));
             } else if (expressionStructure.is_string()) {
                 std::string ident = expressionStructure.template get<std::string>();
                 return storm::expressions::Expression(getVariableOrConstantExpression(ident, scope, auxiliaryVariables));
diff --git a/src/storm-parsers/parser/JaniParser.h b/src/storm-parsers/parser/JaniParser.h
index 2133f464f..5e2ba447a 100644
--- a/src/storm-parsers/parser/JaniParser.h
+++ b/src/storm-parsers/parser/JaniParser.h
@@ -128,7 +128,7 @@ namespace storm {
             static const bool defaultVariableTransient;
             
             static const bool defaultBooleanInitialValue;
-            static const double defaultRationalInitialValue;
+            static const ValueType defaultRationalInitialValue;
             static const int64_t defaultIntegerInitialValue;
 
             static const std::set<std::string> unsupportedOpstrings;