Changeset 2445 for trunk/sources

Timestamp:

10/22/09 10:31:19 (15 years ago)

Author:

gkronber

Message:

Fixed #787 (LinearRegressionOperator uses leastsquares function of ALGLIB instead of linearregression function)

Location:

trunk/sources

Files:

• ALGLIB/ALGLIB.csproj (modified) (1 diff)
• ALGLIB/descriptivestatistics.cs (added)
• ALGLIB/gammaf.cs (added)
• ALGLIB/igammaf.cs (added)
• ALGLIB/linreg.cs (added)
• ALGLIB/normaldistr.cs (added)
• HeuristicLab.LinearRegression/3.2/LinearRegressionOperator.cs (modified) (1 diff)

trunk/sources/ALGLIB/ALGLIB.csproj

@@ -88 +88 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Compile>
+    <Compile Include="descriptivestatistics.cs" />
+    <Compile Include="gammaf.cs" />
+    <Compile Include="igammaf.cs" />
     <Compile Include="leastsquares.cs" />
+    <Compile Include="linreg.cs" />
     <Compile Include="lq.cs" />
+    <Compile Include="normaldistr.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="qr.cs" />

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

@@ -101 +101 @@
 
     private double[] CalculateCoefficients(double[,] inputMatrix, double[] targetVector) {
-      double[] weights = new double[targetVector.Length];
-      double[] coefficients = new double[inputMatrix.GetLength(1)];
-      for (int i = 0; i < weights.Length; i++) weights[i] = 1.0;
-      // call external ALGLIB solver
-      alglib.leastsquares.buildgeneralleastsquares(ref targetVector, ref weights, ref inputMatrix, inputMatrix.GetLength(0), inputMatrix.GetLength(1), ref coefficients);
+      int retVal = 0;
+      alglib.linreg.linearmodel lm = new alglib.linreg.linearmodel();
+      alglib.linreg.lrreport ar = new alglib.linreg.lrreport();
+      int n = targetVector.Length;
+      int p = inputMatrix.GetLength(1);
+      double[,] dataset = new double[n, p];
+      for (int row = 0; row < n; row++) {
+        for (int column = 0; column < p-1; column++) {
+          dataset[row, column] = inputMatrix[row, column];
+        }
+        dataset[row, p-1] = targetVector[row];
+      }
+      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);
 
+      double[] coefficients = new double[p];
+      for (int i = 0; i < p; i++) {
+        coefficients[i] = lm.w[i+4];
+      }
       return coefficients;
     }