Changeset 17902 for trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/IntervalArithmeticGrammar.cs

Timestamp:

03/16/21 14:23:41 (3 years ago)

Author:

gkronber

Message:

#3073 merged reintegration branch to trunk

Location:

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic

Files:

• . (modified) (1 prop)
• 3.4/Grammars/IntervalArithmeticGrammar.cs (copied) (copied from branches/3073_IA_constraint_splitting/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/IntervalArithmeticGrammar.cs) (6 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Grammars/IntervalArithmeticGrammar.cs

@@ -1 @@
-using System.Collections.Generic;
+#region License Information
+
+/* HeuristicLab
+ * Copyright (C) Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ *
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#endregion
+using System.Collections.Generic;
 using System.Linq;
 using HEAL.Attic;
@@ -8 +30 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableType("5A2300A0-D0FC-4F2D-B910-F86384FE9052")]
-  [Item("IntervalArithmeticGrammar", "Represents a grammar for interval arithmetic")]
+  [Item("IntervalArithmeticGrammar", "Represents a grammar for interval arithmetic which includes linear scaling parts implicitly.")]
   public class IntervalArithmeticGrammar : DataAnalysisGrammar, ISymbolicDataAnalysisGrammar {
     public IntervalArithmeticGrammar() : base(ItemAttribute.GetName(typeof(IntervalArithmeticGrammar)),
@@ -35 +57 @@
       var cos = new Cosine();
       var tan = new Tangent();
+      var tanh = new HyperbolicTangent();
       var log = new Logarithm();
-      var pow = new Power();
+      var exp = new Exponential();
       var square = new Square();
-      var root = new Root();
       var sqrt = new SquareRoot();
-      var exp = new Exponential();
-      var tanh = new HyperbolicTangent();
+      var cube = new Cube();
+      var cbrt = new CubeRoot();
+      var abs = new Absolute();
+      var aq = new AnalyticQuotient();
       var constant = new Constant();
-      var aq = new AnalyticQuotient();
       constant.MinValue = -20;
       constant.MaxValue = 20;
@@ -51 +74 @@
 
       //Special symbols
-      var offset = new Addition {Name = "Offset"};
-      var scaling = new Multiplication {Name = "Scaling"};
+      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, aq
+        add, sub, mul, div, constant, variableSymbol, sin, cos, tan, log, square, sqrt, cube, cbrt, exp,
+        tanh, aq, abs
       };
 
-      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 specialSymbols = new List<Symbol> {aq};
-      var realValueSymbols = new List<Symbol>
-        {add, sub, mul, div, sin, cos, tan, tanh, exp, log, variableSymbol, constant, aq};
+      var bivariateFuncs = new List<Symbol> { add, sub, mul, div, aq };
+      var univariateFuncs = new List<Symbol> { sin, cos, tan, tanh, exp, log, abs, square, cube, sqrt, cbrt };
+      var realValueSymbols = new List<Symbol> {
+         add, sub, mul, div, sin, cos, tan, tanh, exp, log, aq, abs, square, cube, sqrt, cbrt,
+         variableSymbol, constant,
+        };
 
 
@@ -76 +98 @@
       #region define subtree count for special symbols
 
-      foreach (var symb in arithmeticSymbols) SetSubtreeCount(symb, 2, 2);
+      foreach (var symb in bivariateFuncs) SetSubtreeCount(symb, 2, 2);
 
-      foreach (var symb in trigonometricSymbols) SetSubtreeCount(symb, 1, 1);
-
-      foreach (var symb in exponentialAndLogarithmicSymbols) SetSubtreeCount(symb, 1, 1);
+      foreach (var symb in univariateFuncs) SetSubtreeCount(symb, 1, 1);
 
       SetSubtreeCount(offset, 2, 2);
       SetSubtreeCount(scaling, 2, 2);
-      SetSubtreeCount(pow, 2, 2);
-      SetSubtreeCount(root, 2, 2);
-      SetSubtreeCount(square, 1, 1);
-      SetSubtreeCount(sqrt, 1, 1);
-      SetSubtreeCount(aq, 2, 2);
 
       #endregion
@@ -109 +124 @@
       }
 
-      //define childs for power symbols
-      foreach (var symb in powerSymbols) {
-        AddAllowedChildSymbol(symb, variableSymbol, 0);
-        AddAllowedChildSymbol(symb, constant, 1);
-      }
-
-      //define child for sqrt and square
-      foreach (var c in realValueSymbols) {
-        AddAllowedChildSymbol(square, c, 0);
-        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;
+      Symbols.First(s => s is Cube).Enabled = false;
+      Symbols.First(s => s is CubeRoot).Enabled = false;
+      Symbols.First(s => s is Absolute).Enabled = false;
     }
   }