Changeset 17906 for trunk/HeuristicLab.Problems.DataAnalysis

Timestamp:

03/16/21 15:26:50 (4 years ago)

Author:

gkronber

Message:

#3073 bugfixing

Location:

trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval

Files:

• IntervalCollection.cs (modified) (1 diff)
• ShapeConstraint.cs (modified) (2 diffs)
• ShapeConstraintsParser.cs (modified) (11 diffs)

trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/IntervalCollection.cs

@@ -35 +35 @@
     }
 
-    //[Storable]
     private IDictionary<string, Interval> intervals { get; set; } = new Dictionary<string, Interval>();
 

trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/ShapeConstraint.cs

@@ -171 +171 @@
     private string GenerateExpressionString() {
       string expression;
-
+      string write(double val) => double.IsPositiveInfinity(val) ? "inf." : double.IsNegativeInfinity(val) ? "-inf." : $"{val}";
       if (!IsDerivative) {
-        expression = string.Format($"f in [{Interval?.LowerBound} .. {Interval?.UpperBound}]");
+        expression = string.Format($"f in [{write(Interval.LowerBound)} .. {write(Interval.UpperBound)}]");
         if (Regions != null) {
           foreach (var region in Regions.GetReadonlyDictionary())
-            expression += $", {region.Key} in [{region.Value.LowerBound} .. {region.Value.UpperBound}]";
+            expression += $", {region.Key} in [{write(region.Value.LowerBound)} .. {write(region.Value.UpperBound)}]";
         }
         if (Weight != 1.0) {
@@ -194 +194 @@
           derivationString = "³"; break;
       }
-      expression = string.Format($"∂{derivationString}f/∂{Variable}{derivationString} in [{Interval?.LowerBound} .. {Interval?.UpperBound}]");
+      expression = string.Format($"∂{derivationString}f/∂{Variable}{derivationString} in [{write(Interval.LowerBound)} .. {write(Interval.UpperBound)}]");
       if (Regions != null) {
         foreach (var region in Regions.GetReadonlyDictionary())
-          expression += $", {region.Key} in [{region.Value.LowerBound} .. {region.Value.UpperBound}]";
+          expression += $", {region.Key} in [{write(region.Value.LowerBound)} .. {write(region.Value.UpperBound)}]";
       }
       if (Weight != 1.0) {

trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/ShapeConstraintsParser.cs

@@ -61 +61 @@
       } else {
         throw new
-          ArgumentException("Error at your constraints definition constraints have to start with (f | d | ∂ | #)",
+          ArgumentException($"Error at in definition {expr}. Constraints have to start with (f | d | ∂ | #)",
                             nameof(expr));
       }
@@ -68 +68 @@
     // [124 .. 145]
     private const string intervalRegex = @"\s*[\[]" +
-                                         @"\s*(?<lowerBound>[^\s\.;]*)" +
+                                         @"\s*(?<lowerBound>[^\s;]*)" +
                                          @"\s*(\.{2}|\s+|;)" +
                                          @"\s*(?<upperBound>[^\s\]]*)" +
@@ -76 +76 @@
     private const string weightRegex = @"\s*(weight:\s*(?<weight>\S*))?";
     public static ShapeConstraint ParseFunctionRangeConstraint(string expr) {
-      if (!expr.StartsWith("f")) throw new ArgumentException("Invalid function range constraint (e.g. f in [1..2])", nameof(expr));
+      if (!expr.StartsWith("f")) throw new ArgumentException($"Invalid function range constraint {expr} (e.g. f in [1..2])", nameof(expr));
       var start = "f".Length;
       var end = expr.Length;
@@ -95 +95 @@
                     intervalRegex +
                     @"(" +
-                      @"\s*,\s*"+ variableRegex +
+                      @"\s*,\s*" + variableRegex +
                       @"\s *\bin\b" +
                       intervalRegex +
                     @")*" +
                     weightRegex
-                    ); 
+                    );
 
 
@@ -125 +125 @@
               regions.AddInterval(region.Key, region.Value);
             else
-              throw new ArgumentException("A constraint cannot contain multiple regions of the same variable.");
+              throw new ArgumentException($"The constraint {expr} has multiple regions of the same variable.");
           }
           return new ShapeConstraint(interval, regions, weight);
@@ -131 +131 @@
           return new ShapeConstraint(interval, weight);
       } else
-        throw new ArgumentException("The inserted target constraint is not valid.", nameof(expr));
+        throw new ArgumentException($"The inserted target constraint {expr} is not valid.", nameof(expr));
     }
     public static ShapeConstraint ParseDerivationConstraint(string expr) {
@@ -149 +149 @@
                                   @")*" +
                                 weightRegex
-                                ); 
+                                );
 
       if (match.Success) {
@@ -161 +161 @@
         if (enumeratorNumDeriv != "" || denominatorNumDeriv != "") {
           if (enumeratorNumDeriv == "" || denominatorNumDeriv == "")
-            throw new ArgumentException("Number of derivation has to be written on both sides.", nameof(expr));
+            throw new ArgumentException($"Number of derivation has to be written on both sides in {expr}.", nameof(expr));
           if (enumeratorNumDeriv != denominatorNumDeriv)
-            throw new ArgumentException("Derivation number is not equal on both sides.", nameof(expr));
+            throw new ArgumentException($"Derivation number is not equal on both sides in {expr}.", nameof(expr));
         }
 
@@ -187 +187 @@
               regions.AddInterval(region.Key, region.Value);
             else
-              throw new ArgumentException("A constraint cannot contain multiple regions of the same variable.");
+              throw new ArgumentException($"The constraint {expr} has multiple regions of the same variable.");
           }
           return new ShapeConstraint(variable, numberOfDerivation, interval, regions, weight);
@@ -193 +193 @@
           return new ShapeConstraint(variable, numberOfDerivation, interval, weight);
       } else
-        throw new ArgumentException("The inserted derivation constraint is not valid.", nameof(expr));
+        throw new ArgumentException($"The inserted derivation constraint {expr} is not valid.", nameof(expr));
     }
 
@@ -220 +220 @@
       var valid = double.TryParse(input, out var value);
       if (!valid) {
-        throw new ArgumentException("Invalid value (valid value format: \"" + FormatPatterns.GetDoubleFormatPattern() + "\")");
+        throw new ArgumentException($"Invalid value {input} (valid value format: \"" + "+inf. | inf. | -inf. | " + FormatPatterns.GetDoubleFormatPattern() + "\")");
       }