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

Timestamp:

06/17/20 11:23:37 (4 years ago)

Author:

pfleck

Message:

#3040 Stores the datatype of a tree node (e.g. variable nodes) in the tree itself for the interpreter to derive the datatypes for subtrees. This way, the interpreter (and simplifier) do not need an actual dataset to figure out datatypes for subtrees.

File:

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

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

@@ -27 +27 @@
 using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+
+using DoubleVector = MathNet.Numerics.LinearAlgebra.Vector<double>;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
@@ -66 +68 @@
 
     private readonly SymbolicDataAnalysisExpressionTreeVectorInterpreter interpreter;
-    private readonly IDataAnalysisProblemData problemData;
-
-    public VectorTreeSimplifier(SymbolicDataAnalysisExpressionTreeVectorInterpreter interpreter, IDataAnalysisProblemData problemData) {
+
+    public VectorTreeSimplifier(SymbolicDataAnalysisExpressionTreeVectorInterpreter interpreter) {
       this.interpreter = interpreter;
-      this.problemData = problemData;
     }
 
@@ -286 +286 @@
     #region type predicates
     public bool IsScalarNode(ISymbolicExpressionTreeNode node) {
-      var results = interpreter.EvaluateNode(node, problemData.Dataset, problemData.TrainingIndices);
-      return results.All(r => r.IsScalar);
+      return interpreter.GetNodeType(node) == typeof(double);
     }
     public bool IsVectorNode(ISymbolicExpressionTreeNode node) {
-      var results = interpreter.EvaluateNode(node, problemData.Dataset, problemData.TrainingIndices);
-      return results.All(r => r.IsVector);
+      return interpreter.GetNodeType(node) == typeof(DoubleVector);
     }
     #endregion