Changeset 2368 for trunk/sources

Timestamp:

09/17/09 13:32:19 (15 years ago)

Author:

gkronber

Message:

Fixed a bug in the variable impact calculation operators. #750.

Location:

trunk/sources

Files:

• HeuristicLab.DataAnalysis/3.2/Dataset.cs (modified) (1 diff)
• HeuristicLab.LinearRegression/3.2/LinearRegressionOperator.cs (modified) (2 diffs)
• HeuristicLab.Modeling/3.2/VariableEvaluationImpactCalculator.cs (modified) (1 diff)
• HeuristicLab.Modeling/3.2/VariableQualityImpactCalculator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.DataAnalysis/3.2/Dataset.cs

@@ -308 +308 @@
       return min;
     }
+
+    public int CountMissingValues(string variableName) {
+      return CountMissingValues(this.GetVariableIndex(variableName));
+    }
+    public int CountMissingValues(int column) {
+      return CountMissingValues(column, 0, Rows);
+    }
+
+    public int CountMissingValues(string variableName, int start, int end) {
+      return CountMissingValues(this.GetVariableIndex(variableName), start, end);
+    }
+
+    public int CountMissingValues(int column, int start, int end) {
+      int n = 0;
+      for (int i = start; i < end; i++) {
+        double val = GetValue(i, column);
+        if (double.IsNaN(val)) n++;
+      }
+      return n;
+    }
+
     #endregion
 

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

@@ -139 +139 @@
       double n = end - start;
       for (int i = 0; i < dataset.Columns; i++) {
-        double nanRatio = CountNaN(dataset, i, start, end) / n;
+        double nanRatio = dataset.CountMissingValues(i, start, end) / n;
         if (i != targetVariable && nanRatio < 0.1 && dataset.GetRange(i, start, end) > 0.0) {
           allowedColumns.Add(i);
@@ -146 +146 @@
       return allowedColumns;
     }
-
-    private double CountNaN(Dataset dataset, int column, int start, int end) {
-      double n = 0;
-      for (int i = start; i < end; i++) {
-        if (double.IsNaN(dataset.GetValue(i, column)) || double.IsInfinity(dataset.GetValue(i, column)))
-          n++;
-      }
-      return n;
-    }
-
 
     private double[,] PrepareInputMatrix(Dataset dataset, List<int> allowedColumns, List<int> allowedRows, int minTimeOffset, int maxTimeOffset) {

trunk/sources/HeuristicLab.Modeling/3.2/VariableEvaluationImpactCalculator.cs

@@ -97 +97 @@
       foreach (string variableName in variables) {
         if (variableName != targetVariableName) {
-          mean = dataset.GetMean(variableName, start, end);
-          oldValues = dirtyDataset.ReplaceVariableValues(variableName, Enumerable.Repeat(mean, end - start), start, end);
-          newValues = predictor.Predict(dirtyDataset, start, end);
-          evaluationImpacts[variableName] = 1 - CalculateVAF(referenceValues, newValues);
-          dirtyDataset.ReplaceVariableValues(variableName, oldValues, start, end);
+          if (dataset.CountMissingValues(variableName, start, end) < (end - start) && dataset.GetRange(variableName, start, end) > 0.0) {
+            mean = dataset.GetMean(variableName, start, end);
+            oldValues = dirtyDataset.ReplaceVariableValues(variableName, Enumerable.Repeat(mean, end - start), start, end);
+            newValues = predictor.Predict(dirtyDataset, start, end);
+            evaluationImpacts[variableName] = 1 - CalculateVAF(referenceValues, newValues);
+            dirtyDataset.ReplaceVariableValues(variableName, oldValues, start, end);
+          } else {
+            evaluationImpacts[variableName] = 0.0;
+          }
         }
       }

trunk/sources/HeuristicLab.Modeling/3.2/VariableQualityImpactCalculator.cs

@@ -99 +99 @@
 
       foreach (string variableName in variables) {
-        if (variableName != targetVariableName) {
+        if (dataset.CountMissingValues(variableName, start, end) < (end - start) &&
+          dataset.GetRange(variableName, start, end) > 0.0 &&
+          variableName != targetVariableName) {
           mean = dataset.GetMean(variableName, start, end);
           oldValues = dirtyDataset.ReplaceVariableValues(variableName, Enumerable.Repeat(mean, end - start), start, end);
@@ -106 +108 @@
           evaluationImpacts[variableName] = newMSE / oldMSE;
           dirtyDataset.ReplaceVariableValues(variableName, oldValues, start, end);
+        } else {
+          evaluationImpacts[variableName] = 1.0;
         }
       }