Better error message in ValueParser

src/storm/parser/ValueParser.cpp

@@ -1,6 +1,7 @@
 #include "storm/parser/ValueParser.h"
 
 #include "storm/exceptions/NotSupportedException.h"
+#include "storm/exceptions/WrongFormatException.h"
 
 namespace storm {
     namespace parser {
@@ -12,7 +13,6 @@ namespace storm {
 
         template<>
         void ValueParser<storm::RationalFunction>::addParameter(std::string const& parameter) {
-            //STORM_LOG_THROW((std::is_same<ValueType, storm::RationalFunction>::value), storm::exceptions::NotSupportedException, "Parameters only allowed when using rational functions.");
             storm::expressions::Variable var = manager->declareRationalVariable(parameter);
             identifierMapping.emplace(var.getName(), var);
             parser.setIdentifierMapping(identifierMapping);
@@ -21,8 +21,13 @@ namespace storm {
 
         template<>
         double ValueParser<double>::parseValue(std::string const& value) const {
+            try {
                 return boost::lexical_cast<double>(value);
             }
+            catch(boost::bad_lexical_cast &) {
+                STORM_LOG_THROW(false, storm::exceptions::WrongFormatException, "Could not parse value '" << value << "'.");
+            }
+        }
 
         template<>
         storm::RationalFunction ValueParser<storm::RationalFunction>::parseValue(std::string const& value) const {