Changeset 6002 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine

Timestamp:

04/11/11 18:41:03 (14 years ago)

Author:

gkronber

Message:

#790 Fixed minor issues in LDA, LR, SVC and SVR to make sure everything works correctly in presence of NaN and infinity values.

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineUtil.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineUtil.cs

@@ -41 +41 @@
       int maxNodeIndex = 0;
       int svmProblemRowIndex = 0;
+      List<string> inputVariablesList = inputVariables.ToList();
       foreach (int row in rowIndices) {
         tempRow = new List<SVM.Node>();
-        foreach (var inputVariable in inputVariables) {
-          int col = dataset.GetVariableIndex(inputVariable);
-          double value = dataset[row, col];
+        int colIndex = 1; // make sure the smallest node index for SVM = 1
+        foreach (var inputVariable in inputVariablesList) {
+          double value = dataset[row, dataset.GetVariableIndex(inputVariable)];
+          // SVM also works with missing values
+          // => don't add NaN values in the dataset to the sparse SVM matrix representation
           if (!double.IsNaN(value)) {
-            int nodeIndex = col + 1; // make sure the smallest nodeIndex is 1 (libSVM convention)
-            tempRow.Add(new SVM.Node(nodeIndex, value));
-            if (nodeIndex > maxNodeIndex) maxNodeIndex = nodeIndex;
+            tempRow.Add(new SVM.Node(colIndex, value)); // nodes must be sorted in ascending ordered by column index
+            if (colIndex > maxNodeIndex) maxNodeIndex = colIndex;
           }
+          colIndex++;
         }
-        nodes[svmProblemRowIndex++] = tempRow.OrderBy(x => x.Index).ToArray(); // make sure the values are sorted by node index
+        nodes[svmProblemRowIndex++] = tempRow.ToArray();
       }