Changeset 12590 for branches/GBT-trunkintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs

Timestamp:

07/04/15 16:03:36 (9 years ago)

Author:

gkronber

Message:

#2261: preparations for trunk integration (adapt to current trunk version, add license headers, add comments, improve code quality)

File:

• branches/GBT-trunkintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs (modified) (2 diffs)

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

@@ -1 @@
-using System;
+#region License Information
+/* HeuristicLab
+ * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * and the BEACON Center for the Study of Evolution in Action.
+ * 
+ * This file is part of HeuristicLab.
+ *
+ * HeuristicLab is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * HeuristicLab is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
+ */
+#endregion
+
 using System.Collections.Generic;
 using System.Linq;
@@ -7 +28 @@
 using HeuristicLab.Problems.DataAnalysis;
 
-namespace GradientBoostedTrees {
+namespace HeuristicLab.Algorithms.DataAnalysis {
   [StorableClass]
   [Item("RegressionTreeModel", "Represents a decision tree for regression.")]
-  // TODO: Implement a view for this
   public class RegressionTreeModel : NamedItem, IRegressionModel {
 
     // trees are represented as a flat array
-    // object-graph-travesal has problems if this is defined as a struct. TODO investigate...
-    //[StorableClass]
     public struct TreeNode {
       public readonly static string NO_VARIABLE = string.Empty;
-      //[Storable]
       public string varName; // name of the variable for splitting or -1 if terminal node
-      //[Storable]
       public double val; // threshold
-      //[Storable]
       public int leftIdx;
-      //[Storable]
       public int rightIdx;
 
-      //public TreeNode() {
-      //  varName = NO_VARIABLE;
-      //  leftIdx = -1;
-      //  rightIdx = -1;
-      //}
-      //[StorableConstructor]
-      //private TreeNode(bool deserializing) { }
-      public override int GetHashCode()
-      {
-        return (leftIdx * rightIdx) ^ val.GetHashCode();
+      public override int GetHashCode() {
+        return leftIdx ^ rightIdx ^ val.GetHashCode();
       }
     }