Changeset 2412 for trunk/sources/HeuristicLab.SupportVectorMachines

Timestamp:

10/06/09 09:49:51 (15 years ago)

Author:

gkronber

Message:

Fixed #773 (SVM predictor doesn't work correctly if the target variable contains NaN values)

Location:

trunk/sources/HeuristicLab.SupportVectorMachines/3.2

Files:

• Predictor.cs (modified) (1 diff)
• SVMHelper.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/Predictor.cs

@@ -75 +75 @@
       }
 
+
       Problem p = SVMHelper.CreateSVMProblem(input, input.GetVariableIndex(targetVariable), newIndex,
         start, end, minTimeOffset, maxTimeOffset);
       Problem scaledProblem = SVM.Scaling.Scale(p, transform);
 
+      int targetVariableIndex = input.GetVariableIndex(targetVariable);
       int rows = end - start;
-      int columns = input.Columns;
       double[] result = new double[rows];
-      for (int row = 0; row < rows; row++) {
-        result[row] = Math.Max(Math.Min(SVM.Prediction.Predict(model, scaledProblem.X[row]), UpperPredictionLimit), LowerPredictionLimit);
+      int problemRow = 0;
+      for (int resultRow = 0; resultRow < rows; resultRow++) {
+        if (double.IsNaN(input.GetValue(resultRow, targetVariableIndex)))
+          result[resultRow] = UpperPredictionLimit;
+        else
+          result[resultRow] = Math.Max(Math.Min(SVM.Prediction.Predict(model, scaledProblem.X[problemRow++]), UpperPredictionLimit), LowerPredictionLimit);
       }
       return result;

trunk/sources/HeuristicLab.SupportVectorMachines/3.2/SVMHelper.cs

@@ -24 +24 @@
       }
 
-      int maxColumns = (dataset.Columns - skippedFeatures.Count()) * (maxTimeOffset - minTimeOffset + 1);
+      int maxColumns = 0;
 
       double[] targetVector = new double[rowCount];
@@ -44 +44 @@
               int actualColumn = columnMapping[col] * (maxTimeOffset - minTimeOffset + 1) + (timeOffset - minTimeOffset);
               double value = dataset.GetValue(start + row + timeOffset, col);
-              if (!double.IsNaN(value))
+              if (!double.IsNaN(value)) {
                 tempRow.Add(new SVM.Node(actualColumn, value));
+                if (actualColumn > maxColumns) maxColumns = actualColumn;
+              }
             }
           }