Changeset 17604 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols

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.

Location:

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols

Files:

• ConstantTreeNode.cs (modified) (2 diffs)
• FactorVariableTreeNode.cs (modified) (1 diff)
• VariableBase.cs (modified) (2 diffs)
• VariableTreeNodeBase.cs (modified) (2 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/ConstantTreeNode.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -37 +38 @@
       get { return constantValue; }
       set { constantValue = value; }
+    }
+
+    public override Type DataType {
+      get { return typeof(double); }
     }
 

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/FactorVariableTreeNode.cs

@@ -44 +44 @@
       get { return variableName; }
       set { variableName = value; }
+    }
+
+    public override Type DataType {
+      get { return typeof(double); }
     }
 

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableBase.cs

@@ -142 +142 @@
       get { return maximumArity; }
     }
+
+    [Storable]
+    private Type variableDataType;
+    public Type VariableDataType {
+      get { return variableDataType; }
+      set {
+        if (variableDataType == value) return;
+        variableDataType = value;
+        OnChanged(EventArgs.Empty);
+      }
+    }
     #endregion
 
@@ -166 +177 @@
       multiplicativeWeightManipulatorSigma = original.multiplicativeWeightManipulatorSigma;
       variableChangeProbability = original.variableChangeProbability;
+      variableDataType = original.variableDataType;
     }
     protected VariableBase(string name, string description)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/VariableTreeNodeBase.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -42 +43 @@
       get { return variableName; }
       set { variableName = value; }
+    }
+
+    public override Type DataType {
+      get { return Symbol.VariableDataType; }
     }