Changeset 12375

Timestamp:

05/04/15 11:54:43 (9 years ago)

Author:

gkronber

Message:

#2283: made TreeNodes structs instead of classes

File:

• branches/GBT/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs (modified) (1 diff)

branches/GBT/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs

@@ -15 +15 @@
     // trees are represented as a flat array
     // object-graph-travesal has problems if this is defined as a struct. TODO investigate...
-    [StorableClass]
-    public class TreeNode {
+    //[StorableClass]
+    public struct TreeNode {
       public readonly static string NO_VARIABLE = string.Empty;
-      [Storable]
+      //[Storable]
       public string varName; // name of the variable for splitting or -1 if terminal node
-      [Storable]
+      //[Storable]
       public double val; // threshold
-      [Storable]
+      //[Storable]
       public int leftIdx;
-      [Storable]
+      //[Storable]
       public int rightIdx;
 
-      public TreeNode() {
-        varName = NO_VARIABLE;
-        leftIdx = -1;
-        rightIdx = -1;
+      //public TreeNode() {
+      //  varName = NO_VARIABLE;
+      //  leftIdx = -1;
+      //  rightIdx = -1;
+      //}
+      //[StorableConstructor]
+      //private TreeNode(bool deserializing) { }
+      public override int GetHashCode()
+      {
+        return (leftIdx * rightIdx) ^ val.GetHashCode();
       }
-      [StorableConstructor]
-      private TreeNode(bool deserializing) { }
     }