Changeset 16360

Timestamp:

12/11/18 10:16:56 (5 years ago)

Author:

gkronber

Message:

#2915 renamed class AnalyticalQuotient -> AnalyticQuotient

Location:

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• Converters/TreeSimplifier.cs (modified) (2 diffs)
• Converters/TreeToAutoDiffTermConverter.cs (modified) (2 diffs)
• Grammars/FullFunctionalExpressionGrammar.cs (modified) (1 diff)
• Grammars/TypeCoherentExpressionGrammar.cs (modified) (1 diff)
• Importer/InfixExpressionParser.cs (modified) (1 diff)
• Importer/SymbolicExpressionImporter.cs (modified) (1 diff)
• Interpreter/OpCodes.cs (modified) (2 diffs)
• Interpreter/SymbolicDataAnalysisExpressionCompiledTreeInterpreter.cs (modified) (1 diff)
• Interpreter/SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs (modified) (1 diff)
• Interpreter/SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs (modified) (1 diff)
• Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs (modified) (1 diff)
• Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs (modified) (1 diff)
• Symbols/AnalyticalQuotient.cs (modified) (2 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeSimplifier.cs

@@ -43 +43 @@
     private static readonly Square sqrSymbol = new Square();
     private static readonly SquareRoot sqrtSymbol = new SquareRoot();
-    private static readonly AnalyticalQuotient aqSymbol = new AnalyticalQuotient();
+    private static readonly AnalyticQuotient aqSymbol = new AnalyticQuotient();
     private static readonly Cube cubeSymbol = new Cube();
     private static readonly CubeRoot cubeRootSymbol = new CubeRoot();
@@ -186 +186 @@
 
     private static bool IsAnalyticalQuotient(ISymbolicExpressionTreeNode node) {
-      return node.Symbol is AnalyticalQuotient;
+      return node.Symbol is AnalyticQuotient;
     }
 

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToAutoDiffTermConverter.cs

@@ -222 +222 @@
         return abs(x1);
       }
-      if (node.Symbol is AnalyticalQuotient) {
+      if (node.Symbol is AnalyticQuotient) {
         var x1 = ConvertToAutoDiff(node.GetSubtree(0));
         var x2 = ConvertToAutoDiff(node.GetSubtree(1));
@@ -325 +325 @@
           !(n.Symbol is StartSymbol) &&
           !(n.Symbol is Absolute) &&
-          !(n.Symbol is AnalyticalQuotient) &&
+          !(n.Symbol is AnalyticQuotient) &&
           !(n.Symbol is Cube) &&
           !(n.Symbol is CubeRoot)

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

@@ -48 +48 @@
       var mul = new Multiplication();
       var div = new Division();
-      var aq = new AnalyticalQuotient();
+      var aq = new AnalyticQuotient();
       var mean = new Average();
       var sin = new Sine();

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

@@ -89 +89 @@
       var psi = new Psi();
       var sineIntegral = new SineIntegral();
-      var analyticalQuotient = new AnalyticalQuotient();
+      var analyticalQuotient = new AnalyticQuotient();
 
       var @if = new IfThenElse();

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs

@@ -126 +126 @@
         { "DAWSON", new Dawson()},
         { "EXPINT", new ExponentialIntegralEi()},
-        { "AQ", new AnalyticalQuotient() },
+        { "AQ", new AnalyticQuotient() },
         { "MEAN", new Average()},
         { "IF", new IfThenElse()},

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/SymbolicExpressionImporter.cs

@@ -68 +68 @@
         {"DAWSON", new Dawson()},
         {"EXPINT", new ExponentialIntegralEi()},
-        {"AQ", new AnalyticalQuotient() },
+        {"AQ", new AnalyticQuotient() },
         {"MEAN", new Average()},
         {"IF", new IfThenElse()},

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/OpCodes.cs

@@ -86 +86 @@
     public const byte BinaryFactorVariable = 47;
     public const byte Absolute = 48;
-    public const byte AnalyticalQuotient = 49;
+    public const byte AnalyticQuotient = 49;
     public const byte Cube = 50;
     public const byte CubeRoot = 51;
@@ -141 +141 @@
       { typeof(BinaryFactorVariable), OpCodes.BinaryFactorVariable },
       { typeof(Absolute), OpCodes.Absolute },
-      { typeof(AnalyticalQuotient), OpCodes.AnalyticalQuotient },
+      { typeof(AnalyticQuotient), OpCodes.AnalyticQuotient },
       { typeof(Cube), OpCodes.Cube },
       { typeof(CubeRoot), OpCodes.CubeRoot }

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionCompiledTreeInterpreter.cs

@@ -507 +507 @@
               result);
           }
-        case OpCodes.AnalyticalQuotient: {
+        case OpCodes.AnalyticQuotient: {
             var x1 = MakeExpr(node.GetSubtree(0), variableIndices, row, columns);
             var x2 = MakeExpr(node.GetSubtree(1), variableIndices, row, columns);

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeBatchInterpreter.cs

@@ -166 +166 @@
             }
 
-          case OpCodes.AnalyticalQuotient: {
+          case OpCodes.AnalyticQuotient: {
               Load(instr.buf, code[c].buf);
               AnalyticQuotient(instr.buf, code[c + 1].buf);

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeILEmittingInterpreter.cs

@@ -409 +409 @@
             return;
           }
-        case OpCodes.AnalyticalQuotient: {
+        case OpCodes.AnalyticQuotient: {
             CompileInstructions(il, state, ds); // x1
             CompileInstructions(il, state, ds); // x2

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeInterpreter.cs

@@ -351 +351 @@
           }
 
-        case OpCodes.AnalyticalQuotient: {
+        case OpCodes.AnalyticQuotient: {
             var x1 = Evaluate(dataset, ref row, state);
             var x2 = Evaluate(dataset, ref row, state);

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeLinearInterpreter.cs

@@ -215 +215 @@
           if (instr.nArguments == 1) p = 1.0 / p;
           instr.value = p;
-        } else if (instr.opCode == OpCodes.AnalyticalQuotient) {
+        } else if (instr.opCode == OpCodes.AnalyticQuotient) {
           var x1 = code[instr.childIndex].value;
           var x2 = code[instr.childIndex + 1].value;

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/AnalyticalQuotient.cs

@@ -26 +26 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
-  [Item("Analytical Quotient", "TODO")]
-  public sealed class AnalyticalQuotient : Symbol {
+  [Item("Analytic Quotient", "The analytic quotient function aq(a,b) = a / sqrt(b²+1) can be used as an " +
+    "alternative to protected division. See H. Drieberg and P. Rocket, The Use of an Analytic Quotient Operator" +
+    " in Genetic Programming. IEEE Transactions on Evolutionary Computation, Vol. 17, No. 1, February 2013, pp 146 -- 152")]
+  public sealed class AnalyticQuotient : Symbol {
     private const int minimumArity = 2;
     private const int maximumArity = 2;
@@ -39 +41 @@
 
     [StorableConstructor]
-    private AnalyticalQuotient(bool deserializing) : base(deserializing) { }
-    private AnalyticalQuotient(AnalyticalQuotient original, Cloner cloner) : base(original, cloner) { }
+    private AnalyticQuotient(bool deserializing) : base(deserializing) { }
+    private AnalyticQuotient(AnalyticQuotient original, Cloner cloner) : base(original, cloner) { }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new AnalyticalQuotient(this, cloner);
+      return new AnalyticQuotient(this, cloner);
     }
-    public AnalyticalQuotient() : base("AnalyticalQuotient", "TODO") { }
+    public AnalyticQuotient() : base("AnalyticalQuotient", "The analytic quotient function aq(a,b) = a / sqrt(b²+1) can be used as an " +
+    "alternative to protected division. See H. Drieberg and P. Rocket, The Use of an Analytic Quotient Operator" +
+    " in Genetic Programming. IEEE Transactions on Evolutionary Computation, Vol. 17, No. 1, February 2013, pp 146 -- 152") { }
   }
 }