Changeset 17880 for branches

Timestamp:

03/12/21 08:30:42 (4 years ago)

Author:

chaider

Message:

#3073

• Added AQ to IntervalArithmeticGrammar
• Fixed bug in IABoundsEstimator

Location:

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

Files:

• Grammars/IntervalArithmeticGrammar.cs (modified) (4 diffs)
• Interpreter/IABoundsEstimator.cs (modified) (1 diff)

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

@@ -28 +28 @@
       #region Symbols
 
-      var add      = new Addition();
-      var sub      = new Subtraction();
-      var mul      = new Multiplication();
-      var div      = new Division();
-      var sin      = new Sine();
-      var cos      = new Cosine();
-      var tan      = new Tangent();
-      var log      = new Logarithm();
-      var pow      = new Power();
-      var square   = new Square();
-      var root     = new Root();
-      var sqrt     = new SquareRoot();
-      var exp      = new Exponential();
-      var tanh     = new HyperbolicTangent();
+      var add = new Addition();
+      var sub = new Subtraction();
+      var mul = new Multiplication();
+      var div = new Division();
+      var sin = new Sine();
+      var cos = new Cosine();
+      var tan = new Tangent();
+      var log = new Logarithm();
+      var pow = new Power();
+      var square = new Square();
+      var root = new Root();
+      var sqrt = new SquareRoot();
+      var exp = new Exponential();
+      var tanh = new HyperbolicTangent();
       var constant = new Constant();
+      var aq = new AnalyticQuotient();
       constant.MinValue = -20;
       constant.MaxValue = 20;
@@ -50 +51 @@
 
       //Special symbols
-      var offset  = new Addition {Name       = "Offset"};
+      var offset = new Addition {Name = "Offset"};
       var scaling = new Multiplication {Name = "Scaling"};
       //all other symbols
       var allSymbols = new List<Symbol> {
         add, sub, mul, div, constant, variableSymbol, sin, cos, tan, log, pow, square, root, sqrt, exp,
-        tanh
+        tanh, aq
       };
 
-      var arithmeticSymbols                = new List<Symbol> {add, sub, mul, div};
-      var trigonometricSymbols             = new List<Symbol> {sin, cos, tan, tanh};
+      var arithmeticSymbols = new List<Symbol> {add, sub, mul, div};
+      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};
+      var powerSymbols = new List<Symbol> {square, pow, sqrt, root};
+      var specialSymbols = new List<Symbol> {aq};
       var realValueSymbols = new List<Symbol>
-        {add, sub, mul, div, sin, cos, tan, tanh, exp, log, variableSymbol, constant};
+        {add, sub, mul, div, sin, cos, tan, tanh, exp, log, variableSymbol, constant, aq};
 
 
@@ -86 +88 @@
       SetSubtreeCount(square, 1, 1);
       SetSubtreeCount(sqrt, 1, 1);
+      SetSubtreeCount(aq, 2, 2);
 
       #endregion
@@ -117 +120 @@
         AddAllowedChildSymbol(sqrt, c, 0);
       }
+
+      //define child for aq 
+      foreach (var c in realValueSymbols) {
+        AddAllowedChildSymbol(aq, c, 0);
+        AddAllowedChildSymbol(aq, c, 1);
+      }
+
       #endregion
 
       Symbols.First(s => s is Power).Enabled = false;
       Symbols.First(s => s is Root).Enabled = false;
+      Symbols.First(s => s is AnalyticQuotient).Enabled = false;
     }
   }

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

@@ -513 +513 @@
           minimization: true, stopAtLimit: true, limit: constraint.Interval.LowerBound);
 
-        return lowerBound <= constraint.Interval.LowerBound
+        return lowerBound >= constraint.Interval.LowerBound
           ? 0.0
           : Math.Abs(lowerBound - constraint.Interval.LowerBound);