Changeset 17562

Timestamp:

05/27/20 07:34:25 (4 years ago)

Author:

chaider

Message:

#2971 removed root/power symbols

Location:

branches/2971_named_intervals

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/Interval.cs (modified) (3 diffs)

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs

@@ -234 +234 @@
             break;
           }
-        case OpCodes.Power: {
-            result = Evaluate(instructions, ref instructionCounter, nodeIntervals);
-            for (int i = 1; i < currentInstr.nArguments; i++) {
-              var argumentInterval = Evaluate(instructions, ref instructionCounter, nodeIntervals);
-              result = Interval.Power(result, argumentInterval);
-            }
-            break;
-          }
         case OpCodes.Square: {
             var argumentInterval = Evaluate(instructions, ref instructionCounter, nodeIntervals);
             result = Interval.Square(argumentInterval);
-            break;
-          }
-        case OpCodes.Root: {
-            result = Evaluate(instructions, ref instructionCounter, nodeIntervals);
-            for (int i = 1; i < currentInstr.nArguments; i++) {
-              var argumentInterval = Evaluate(instructions, ref instructionCounter, nodeIntervals);
-              result = Interval.Root(result, argumentInterval);
-            }
             break;
           }
@@ -310 +294 @@
           !(n.Symbol is Logarithm) &&
           !(n.Symbol is Exponential) &&
-          !(n.Symbol is Power) && 
           !(n.Symbol is Square) &&
-          !(n.Symbol is Root) && 
           !(n.Symbol is SquareRoot) &&
           !(n.Symbol is Cube) &&

branches/2971_named_intervals/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Interval/Interval.cs

@@ -78 +78 @@
     }
 
-
-
     public override string ToString() {
       return "Interval: [" + LowerBound + ", " + UpperBound + "]";
@@ -228 +226 @@
     }
 
-    public static Interval Power(Interval a, Interval b) {
-      if (a.Contains(0.0) && b.LowerBound < 0) return new Interval(double.NaN, double.NaN);
-
-      int bLower = (int)Math.Round(b.LowerBound);
-      int bUpper = (int)Math.Round(b.UpperBound);
-
-      List<double> powerValues = new List<double>();
-      powerValues.Add(Math.Pow(a.UpperBound, bUpper));
-      powerValues.Add(Math.Pow(a.UpperBound, bUpper - 1));
-      powerValues.Add(Math.Pow(a.UpperBound, bLower));
-      powerValues.Add(Math.Pow(a.UpperBound, bLower + 1));
-
-      powerValues.Add(Math.Pow(a.LowerBound, bUpper));
-      powerValues.Add(Math.Pow(a.LowerBound, bUpper - 1));
-      powerValues.Add(Math.Pow(a.LowerBound, bLower));
-      powerValues.Add(Math.Pow(a.LowerBound, bLower + 1));
-
-      return new Interval(powerValues.Min(), powerValues.Max());
-    }
-
     public static Interval Square(Interval a) {
       if (a.UpperBound <= 0) return new Interval(a.UpperBound * a.UpperBound, a.LowerBound * a.LowerBound);     // interval is negative
@@ -258 +236 @@
     }
 
-    public static Interval Root(Interval a, Interval b) {
-      int lower = (int)Math.Round(b.LowerBound);
-      int higher = (int)Math.Round(b.UpperBound);
-
-      //Root root(0,0) = 0
-      if (a.LowerBound == 0 && b.LowerBound == 0 && lower == 0 && higher == 0)
-        return new Interval(0, 0);
-
-      //Root is zero ==> undefined ==> 5^-(1.0/0)
-      if (higher == 0 || lower == 0)
-        return new Interval(double.NaN, double.NaN);
-
-      if (lower < 0 || higher < 0) {
-        List<double> vals = new List<double>();
-
-        vals.Add(Math.Pow(a.LowerBound, 1.0 / lower));
-        vals.Add(Math.Pow(a.LowerBound, 1.0 / higher));
-
-        vals.Add(Math.Pow(a.UpperBound, 1.0 / lower));
-        vals.Add(Math.Pow(a.UpperBound, 1.0 / higher));
-
-        return new Interval(vals.Min(), vals.Max());
-      }
-
-      return new Interval(Math.Pow(a.LowerBound, 1.0 / higher), Math.Pow(a.UpperBound, 1.0 / lower));
-    }
-
+    /// <summary>
+    /// Calculates the principal square root of a given interval. Discards the second possible result of root, because
+    /// all interpreters just calculate the positive principal root.
+    /// </summary>
+    /// <param name="a">Interval to build square root from.</param>
+    /// <returns></returns>
     public static Interval SquareRoot(Interval a) {
       if (a.LowerBound < 0) return new Interval(double.NaN, double.NaN);