Changeset 17624

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.

Location:

branches/3040_VectorBasedGP

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs (modified) (2 diffs)
• HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeSimplifierTest.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() },
       };
 

branches/3040_VectorBasedGP/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4/SymbolicDataAnalysisExpressionTreeSimplifierTest.cs

@@ -271 +271 @@
 
       #region vectors
-      AssertEqualAfterVectorSimplification(
-        "(sum (vectorvariable 2.0 a))",
-        "(* (sum (vectorvariable 1.0 a)) 2.0)");
-      AssertEqualAfterVectorSimplification(
-        "(sum (* 2.0 (vectorvariable 1.0 a)))",
-        "(* (sum (vectorvariable 1.0 a)) 2.0)");
-      AssertEqualAfterVectorSimplification(
-        "(sum (+ 2.0 (vectorvariable 1.0 a)))",
-        "(+ (* (length (vectorvariable 1.0 a)) 2.0)(sum (vectorvariable 1.0 a)) )");
+      AssertEqualAfterVectorSimplification("remove aggregation for scalars from Sum",
+        "SUM(a)",
+        "a");
+      AssertEqualAfterVectorSimplification("factor out multiplicative scalar from Sum",
+        "SUM(a{} * 2.0)",
+        "SUM(a{}) * 2.0");
+      AssertEqualAfterVectorSimplification("factor out additive scalar from Sum",
+        "SUM(a{} + 2.0)",
+        "LENGTH(a{}) * 2.0 + SUM(a{})");
+
+      AssertEqualAfterVectorSimplification("remove aggregation for scalars from Mean",
+        "MEAN(a)",
+        "a");
+      AssertEqualAfterVectorSimplification("factor out multiplicative scalar from Mean",
+        "MEAN(2.0 * a{})",
+        "MEAN(a{}) * 2.0");
+      AssertEqualAfterVectorSimplification("factor out additive scalar from Mean",
+        "MEAN(a{} + 2.0)",
+        "MEAN(a{}) + 2.0");
+
+      AssertEqualAfterVectorSimplification("remove aggregation for scalars from Length",
+        "LENGTH(a)",
+        "1.0");
+      AssertEqualAfterVectorSimplification("factor out multiplicative scalar from Length",
+        "LENGTH(a{} * 2.0)",
+        "LENGTH(a{})");
+      AssertEqualAfterVectorSimplification("factor out additive scalar from Length",
+        "LENGTH(a{} + 2.0)",
+        "LENGTH(a{})");
+
+      AssertEqualAfterVectorSimplification("remove aggregation for scalars from StandardDeviation",
+        "STDEV(a)",
+        "0.0");
+      AssertEqualAfterVectorSimplification("factor out multiplicative scalar from StandardDeviation",
+        "STDEV(2.0 * a{})",
+        "STDEV(a{}) * 2.0");
+      AssertEqualAfterVectorSimplification("factor out additive scalar from StandardDeviation",
+        "STDEV(a{} + 2.0)",
+        "STDEV(a{})");
+
+      AssertEqualAfterVectorSimplification("remove aggregation for scalars from Variance",
+        "VAR(a)",
+        "0.0");
+      AssertEqualAfterVectorSimplification("factor out multiplicative scalar from Variance",
+        "VAR(a{} * 2.0)",
+        "VAR(a{}) * 4.0");
+      AssertEqualAfterVectorSimplification("factor out additive scalar from Variance",
+        "VAR(a{} + 2.0)",
+        "VAR(a{})");
       #endregion
     }
@@ -292 +332 @@
     }
 
-    private void AssertEqualAfterVectorSimplification(string original, string expected) {
-      var formatter = new SymbolicExpressionTreeStringFormatter();
-      var importer = new SymbolicExpressionImporter();
+    private void AssertEqualAfterVectorSimplification(string msg, string original, string expected) {
+      var formatter = new InfixExpressionFormatter();
+      var parser = new InfixExpressionParser();
       var simplifier = new VectorTreeSimplifier(new SymbolicDataAnalysisExpressionTreeVectorInterpreter());
-      var actualTree = simplifier.Simplify(importer.Import(original));
-      var expectedTree = importer.Import(expected);
-      Assert.AreEqual(formatter.Format(expectedTree), formatter.Format(actualTree));
+      var actualTree = simplifier.Simplify(parser.Parse(original));
+      var expectedTree = parser.Parse(expected);
+      Assert.AreEqual(formatter.Format(expectedTree), formatter.Format(actualTree), msg);
     }
   }