Changeset 2226 for trunk/sources/HeuristicLab.LinearRegression

Timestamp:

08/03/09 15:18:36 (16 years ago)

Author:

gkronber

Message:

• Added extension method IsAlmost to type double
• changed evaluation semantics of boolean operations in HL3TreeEvaluator

(#713)

File:

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

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

@@ -26 +26 @@
 using HeuristicLab.Data;
 using HeuristicLab.DataAnalysis;
+using HeuristicLab.Modeling;
 using HeuristicLab.GP;
 using HeuristicLab.GP.StructureIdentification;
@@ -54 +55 @@
       double[] coefficients = CalculateCoefficients(inputMatrix, targetVector);
       IFunctionTree tree = CreateModel(coefficients, allowedColumns.Select(i => dataset.GetVariableName(i)).ToList());
-      
+
       scope.AddVariable(new HeuristicLab.Core.Variable(scope.TranslateName("LinearRegressionModel"), new GeneticProgrammingModel(tree)));
       return null;
-    }
-
-    private bool IsAlmost(double x, double y) {
-      return Math.Abs(x - y) < 1.0E-12;
     }
 
@@ -125 +122 @@
       for (int i = 0; i < dataset.Columns; i++) {
         if (i == targetVariable) continue;
-        if (!IsAlmost(dataset.GetMinimum(i, start, end), 0.0) ||
-            !IsAlmost(dataset.GetMaximum(i, start, end), 0.0))
+        if (!dataset.GetMinimum(i, start, end).IsAlmost(0.0) ||
+            !dataset.GetMaximum(i, start, end).IsAlmost(0.0))
           allowedColumns.Add(i);
       }