Changeset 5733 for branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4

Timestamp:

03/17/11 14:07:47 (14 years ago)

Author:

mkommend

Message:

#1418: Corrected problem interfaces & unified naming of subtrees.

Location:

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear

Files:

• LinearDiscriminantAnalysis.cs (modified) (3 diffs)
• LinearRegression.cs (modified) (3 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearDiscriminantAnalysis.cs

@@ -90 +90 @@
       ISymbolicExpressionTree tree = new SymbolicExpressionTree(new ProgramRootSymbol().CreateTreeNode());
       ISymbolicExpressionTreeNode startNode = new StartSymbol().CreateTreeNode();
-      tree.Root.AddSubTree(startNode);
+      tree.Root.AddSubtree(startNode);
       ISymbolicExpressionTreeNode addition = new Addition().CreateTreeNode();
-      startNode.AddSubTree(addition);
+      startNode.AddSubtree(addition);
 
       int col = 0;
@@ -99 +99 @@
         vNode.VariableName = column;
         vNode.Weight = w[col];
-        addition.AddSubTree(vNode);
+        addition.AddSubtree(vNode);
         col++;
       }
@@ -105 +105 @@
       ConstantTreeNode cNode = (ConstantTreeNode)new Constant().CreateTreeNode();
       cNode.Value = w[w.Length - 1];
-      addition.AddSubTree(cNode);
+      addition.AddSubtree(cNode);
 
 

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearRegression.cs

@@ -94 +94 @@
       ISymbolicExpressionTree tree = new SymbolicExpressionTree(new ProgramRootSymbol().CreateTreeNode());
       ISymbolicExpressionTreeNode startNode = new StartSymbol().CreateTreeNode();
-      tree.Root.AddSubTree(startNode);
+      tree.Root.AddSubtree(startNode);
       ISymbolicExpressionTreeNode addition = new Addition().CreateTreeNode();
-      startNode.AddSubTree(addition);
+      startNode.AddSubtree(addition);
 
       int col = 0;
@@ -103 +103 @@
         vNode.VariableName = column;
         vNode.Weight = coefficients[col];
-        addition.AddSubTree(vNode);
+        addition.AddSubtree(vNode);
         col++;
       }
@@ -109 +109 @@
       ConstantTreeNode cNode = (ConstantTreeNode)new Constant().CreateTreeNode();
       cNode.Value = coefficients[coefficients.Length - 1];
-      addition.AddSubTree(cNode);
+      addition.AddSubtree(cNode);
 
       SymbolicRegressionSolution solution = new SymbolicRegressionSolution(new SymbolicRegressionModel(tree, new SymbolicDataAnalysisExpressionTreeInterpreter()), problemData);