Changeset 17822

Timestamp:

01/20/21 09:26:09 (3 years ago)

Author:

chaider

Message:

#3073 Fixed double parsing

File:

• branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraintsParser.cs (modified) (5 diffs)

branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalConstraintsParser.cs

@@ -24 +24 @@
 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
 using System.Text.RegularExpressions;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Problems.DataAnalysis {
@@ -89 +89 @@
 
             if (match.Groups[18].Success && !string.IsNullOrWhiteSpace(match.Groups[18].Value))
-              weight = ParseWeight(match.Groups[18].Value);
+              weight = ParseAndValidateDouble(match.Groups[18].Value);
 
             if (match.Groups[10].Success)
@@ -180 +180 @@
 
             if(match.Groups[25].Success && !string.IsNullOrWhiteSpace(match.Groups[25].Value))
-              weight = ParseWeight(match.Groups[25].Value);
+              weight = ParseAndValidateDouble(match.Groups[25].Value);
 
             if(match.Groups[17].Success)
@@ -222 +222 @@
       var regionUb = ParseIntervalBounds(ub);
       return new KeyValuePair<string, Interval>(variable, new Interval(regionLb, regionUb));
-      //return new Region(variable, new Interval(regionLb, regionUb));
     }
 
@@ -234 +233 @@
           return double.NegativeInfinity;
         default: {
-          if (double.TryParse(input.Replace(',', '.'), NumberStyles.Any, CultureInfo.InvariantCulture, out var value))
-            return value;
-          throw new ArgumentException("The given boundary is not a double value!");
-        }
-      }
-    }
-
-    private static double ParseWeight(string input)
-    {
-      if (double.TryParse(input, NumberStyles.Any, CultureInfo.InvariantCulture, out var value))
-        return value;
-      throw new ArgumentException("The given weight is not a double value!");
+          return ParseAndValidateDouble(input);
+        }
+      }
+    }
+
+    private static double ParseAndValidateDouble(string input) {
+      var valid = double.TryParse(input, out var value);
+      if (!valid) {
+        throw new ArgumentException("Invalid Value (Valid Value Format: \"" + FormatPatterns.GetDoubleFormatPattern() + "\")");
+      }
+
+      return value;
     }