Changeset 17911 for trunk/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval

Timestamp:

03/23/21 15:24:58 (4 years ago)

Author:

gkronber

Message:

#3073 code improvements after reintegration of branch

Location:

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

Files:

• Interval.cs (modified) (2 diffs)
• ShapeConstraintsParser.cs (modified) (4 diffs)

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

@@ -271 +271 @@
     }
 
-    public static Interval AnalyticalQuotient(Interval a, Interval b) {
+    public static Interval AnalyticQuotient(Interval a, Interval b) {
       var dividend = a;
       var divisor = Add(Square(b), new Interval(1.0, 1.0));
@@ -306 +306 @@
     public static Interval CubicRoot(double a) { return CubicRoot(new Interval(a)); }
     public static Interval Absolute(double a) { return Absolute(new Interval(a)); }
-    public static Interval AnalyticQuotient(Interval a, double b) { return AnalyticalQuotient(a, new Interval(b)); }
-    public static Interval AnalyticQuotient(double a, Interval b) { return AnalyticalQuotient(new Interval(a), b); }
-    public static Interval AnalyticQuotient(double a, double b) { return AnalyticalQuotient(new Interval(a), new Interval(b)); }
+    public static Interval AnalyticQuotient(Interval a, double b) { return AnalyticQuotient(a, new Interval(b)); }
+    public static Interval AnalyticQuotient(double a, Interval b) { return AnalyticQuotient(new Interval(a), b); }
+    public static Interval AnalyticQuotient(double a, double b) { return AnalyticQuotient(new Interval(a), new Interval(b)); }
     #endregion
   }

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

@@ -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 {expr} (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])");
       var start = "f".Length;
       var end = expr.Length;
@@ -131 +131 @@
           return new ShapeConstraint(interval, weight);
       } else
-        throw new ArgumentException($"The inserted target constraint {expr} is not valid.", nameof(expr));
+        throw new ArgumentException($"The target constraint {expr} is not valid.");
     }
     public static ShapeConstraint ParseDerivationConstraint(string expr) {
@@ -161 +161 @@
         if (enumeratorNumDeriv != "" || denominatorNumDeriv != "") {
           if (enumeratorNumDeriv == "" || denominatorNumDeriv == "")
-            throw new ArgumentException($"Number of derivation has to be written on both sides in {expr}.", nameof(expr));
+            throw new ArgumentException($"Number of derivation has to be written on both sides in {expr}.");
           if (enumeratorNumDeriv != denominatorNumDeriv)
-            throw new ArgumentException($"Derivation number is not equal on both sides in {expr}.", nameof(expr));
+            throw new ArgumentException($"Derivation number is not equal on both sides in {expr}.");
         }
 
@@ -193 +193 @@
           return new ShapeConstraint(variable, numberOfDerivation, interval, weight);
       } else
-        throw new ArgumentException($"The inserted derivation constraint {expr} is not valid.", nameof(expr));
+        throw new ArgumentException($"The derivation constraint {expr} is not valid.");
     }