Changeset 17650

Timestamp:

07/07/20 12:05:41 (4 years ago)

Author:

chaider

Message:

#3073

• Added HyperbolicTangent as known symbol to IntervalInterpreter and DerivativeCalculator
• Removed Cube- and Cuberoot-Symbol from IntervalArithmeticGrammar and set Power- and Root-Symbol to disabled

Location:

branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• Converters/DerivativeCalculator.cs (modified) (1 diff)
• Grammars/IntervalArithmeticGrammar.cs (modified) (6 diffs)
• Interpreter/IntervalInterpreter.cs (modified) (1 diff)

branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/DerivativeCalculator.cs

@@ -265 +265 @@
           !(n.Symbol is Absolute) &&
           !(n.Symbol is AnalyticQuotient) &&
+          !(n.Symbol is HyperbolicTangent) &&
           !(n.Symbol is Sine) &&
           !(n.Symbol is Cosine) &&

branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/IntervalArithmeticGrammar.cs

@@ -1 +1 @@
 using System.Collections.Generic;
+using System.Linq;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -39 +40 @@
       var root     = new Root();
       var sqrt     = new SquareRoot();
-      var cube     = new Cube();
-      var cubeRoot = new CubeRoot();
       var exp      = new Exponential();
       var tanh     = new HyperbolicTangent();
@@ -55 +54 @@
       //all other symbols
       var allSymbols = new List<Symbol> {
-        add, sub, mul, div, constant, variableSymbol, sin, cos, tan, log, pow, square, root, sqrt, cube, cubeRoot, exp,
+        add, sub, mul, div, constant, variableSymbol, sin, cos, tan, log, pow, square, root, sqrt, exp,
         tanh
       };
@@ -62 +61 @@
       var trigonometricSymbols             = new List<Symbol> {sin, cos, tan, tanh};
       var exponentialAndLogarithmicSymbols = new List<Symbol> {exp, log};
-      var powerSymbols                     = new List<Symbol> {square, pow, sqrt, root, cube, cubeRoot};
+      var powerSymbols                     = new List<Symbol> {square, pow, sqrt, root};
       var realValueSymbols = new List<Symbol>
         {add, sub, mul, div, sin, cos, tan, tanh, exp, log, variableSymbol, constant};
@@ -86 +85 @@
       SetSubtreeCount(root, 2, 2);
       SetSubtreeCount(square, 1, 1);
-      SetSubtreeCount(cube, 1, 1);
       SetSubtreeCount(sqrt, 1, 1);
-      SetSubtreeCount(cubeRoot, 1, 1);
 
       #endregion
@@ -121 +118 @@
       }
       #endregion
+
+      Symbols.First(s => s is Power).Enabled = false;
+      Symbols.First(s => s is Root).Enabled = false;
     }
   }

branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/IntervalInterpreter.cs

@@ -461 +461 @@
           !(n.Symbol is Cosine) &&
           !(n.Symbol is Tangent) &&
+          !(n.Symbol is HyperbolicTangent) &&
           !(n.Symbol is Logarithm) &&
           !(n.Symbol is Exponential) &&