Changeset 18060 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/VectorTreeSimplifier.cs

Timestamp:

09/28/21 13:37:43 (3 years ago)

Author:

pfleck

Message:

#3040 Added a subvector symbol with ranges as subtrees.

File:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/VectorTreeSimplifier.cs (modified) (5 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/VectorTreeSimplifier.cs

@@ -66 +66 @@
     private static readonly StandardDeviation standardDeviationSymbol = new StandardDeviation();
     private static readonly Variance varianceSymbol = new Variance();
+    private static readonly Min minSymbol = new Min();
+    private static readonly Max maxSymbol = new Max();
 
     private readonly SymbolicDataAnalysisExpressionTreeVectorInterpreter interpreter;
@@ -281 +283 @@
     private static bool IsVariance(ISymbolicExpressionTreeNode node) {
       return node.Symbol is Variance;
+    }
+
+    private static bool IsMin(ISymbolicExpressionTreeNode node) {
+      return node.Symbol is Min;
+    }
+
+    private static bool IsMax(ISymbolicExpressionTreeNode node) {
+      return node.Symbol is Max;
     }
     #endregion
@@ -363 +373 @@
       } else if (IsVariance(original)) {
         return SimplifyVarianceAggregation(original);
+      } else if (IsMin(original)) {
+        return SimplifyMinAggregation(original);
+      } else if (IsMax(original)) {
+        return SimplifyMaxAggregation(original);
       } else {
         return SimplifyAny(original);
@@ -574 +588 @@
     private ISymbolicExpressionTreeNode SimplifyVarianceAggregation(ISymbolicExpressionTreeNode original) {
       return MakeVarianceAggregation(GetSimplifiedTree(original.GetSubtree(0)));
+    }
+
+    private ISymbolicExpressionTreeNode SimplifyMinAggregation(ISymbolicExpressionTreeNode original) {
+      return MakeMinAggregation(GetSimplifiedTree(original.GetSubtree(0)));
+    }
+
+    private ISymbolicExpressionTreeNode SimplifyMaxAggregation(ISymbolicExpressionTreeNode original) {
+      return MakeMaxAggregation(GetSimplifiedTree(original.GetSubtree(0)));
     }
     #endregion
@@ -1508 +1530 @@
         });
     }
+
+    private ISymbolicExpressionTreeNode MakeMinAggregation(ISymbolicExpressionTreeNode node) {
+      return MakeAggregation(node, meanSymbol,
+        simplifyScalar: n => n,
+        simplifyAdditiveTerms: (vectorNode, scalarNode) => {
+          var minNode = MakeMinAggregation(vectorNode);
+          return MakeSum(scalarNode, minNode);
+        },
+        simplifyMultiplicativeFactors: (vectorNode, scalarNode) => {
+          var minNode = MakeMinAggregation(vectorNode);
+          return MakeProduct(scalarNode, minNode);
+        });
+    }
+
+    private ISymbolicExpressionTreeNode MakeMaxAggregation(ISymbolicExpressionTreeNode node) {
+      return MakeAggregation(node, meanSymbol,
+        simplifyScalar: n => n,
+        simplifyAdditiveTerms: (vectorNode, scalarNode) => {
+          var maxNode = MakeMaxAggregation(vectorNode);
+          return MakeSum(scalarNode, maxNode);
+        },
+        simplifyMultiplicativeFactors: (vectorNode, scalarNode) => {
+          var maxNode = MakeMaxAggregation(vectorNode);
+          return MakeProduct(scalarNode, maxNode);
+        });
+    }
     #endregion