Changeset 17624 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs

Timestamp:

06/22/20 14:55:40 (4 years ago)

Author:

pfleck

Message:

#3040

• Switched vector-simplification unit-test to infix notation to avoid ambiguities between the peek-string "VAR" for variables and the variance function.
• Added additional unit tests for mean, length, stdev and var simplifications.

File:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs (modified) (2 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs

@@ -132 +132 @@
         { "EXPINT", new ExponentialIntegralEi()},
         { "AQ", new AnalyticQuotient() },
-        { "MEAN", new Average()},
+        //{ "MEAN", new Average()},
         { "IF", new IfThenElse()},
         { "GT", new GreaterThan()},
@@ -142 +142 @@
         { "DIFF", new Derivative()},
         { "LAG", new LaggedVariable() },
+        { "SUM", new Sum() },
+        { "MEAN", new Mean() },
+        { "LENGTH", new Length() },
+        { "STDEV", new StandardDeviation() },
+        { "VAR", new Variance() },
       };