Changeset 2538

Timestamp:

12/03/09 12:53:07 (14 years ago)

Author:

gkronber

Message:

Fixed #811

File:

• trunk/sources/HeuristicLab.LinearRegression/3.2/LinearRegressionOperator.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.LinearRegression/3.2/LinearRegressionOperator.cs

@@ -71 +71 @@
     private IFunctionTree CreateModel(double[] coefficients, List<string> allowedVariables, int minTimeOffset, int maxTimeOffset) {
       IFunctionTree root = new Addition().GetTreeNode();
-      IFunctionTree actNode = root;
+
       int timeOffsetRange = (maxTimeOffset - minTimeOffset + 1);
 
-      Queue<IFunctionTree> nodes = new Queue<IFunctionTree>();
       for (int i = 0; i < allowedVariables.Count; i++) {
         for (int timeOffset = minTimeOffset; timeOffset <= maxTimeOffset; timeOffset++) {
@@ -81 +80 @@
           vNode.Weight = coefficients[(i * timeOffsetRange) + (timeOffset - minTimeOffset)];
           vNode.SampleOffset = timeOffset;
-          nodes.Enqueue(vNode);
+          root.AddSubTree(vNode);
         }
       }
@@ -87 +86 @@
 
       cNode.Value = coefficients[coefficients.Length - 1];
-      nodes.Enqueue(cNode);
-
-      IFunctionTree newTree;
-      while (nodes.Count != 1) {
-        newTree = new Addition().GetTreeNode();
-        newTree.AddSubTree(nodes.Dequeue());
-        newTree.AddSubTree(nodes.Dequeue());
-        nodes.Enqueue(newTree);
-      }
-
-      return nodes.Dequeue();
+      root.AddSubTree(cNode);
+      return root;
     }
 
@@ -108 +98 @@
       double[,] dataset = new double[n, p];
       for (int row = 0; row < n; row++) {
-        for (int column = 0; column < p-1; column++) {
+        for (int column = 0; column < p - 1; column++) {
           dataset[row, column] = inputMatrix[row, column];
         }
-        dataset[row, p-1] = targetVector[row];
+        dataset[row, p - 1] = targetVector[row];
       }
-      alglib.linreg.lrbuild(ref dataset, n, p-1, ref retVal, ref lm, ref ar);
+      alglib.linreg.lrbuild(ref dataset, n, p - 1, ref retVal, ref lm, ref ar);
       if (retVal != 1) throw new ArgumentException("Error in calculation of linear regression model");
       Console.Out.WriteLine("ALGLIB Linear Regression: Estimated generalization RMS = {0}", ar.cvrmserror);
@@ -119 +109 @@
       double[] coefficients = new double[p];
       for (int i = 0; i < p; i++) {
-        coefficients[i] = lm.w[i+4];
+        coefficients[i] = lm.w[i + 4];
       }
       return coefficients;