Changeset 3858 for trunk/sources/HeuristicLab.ExtLibs

Timestamp:

05/20/10 16:47:12 (14 years ago)

Author:

mkommend

Message:

added calculation and view for support vectors (ticket #1009)

Location:

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.LibSVM/1.6.3/LibSVM-1.6.3

Files:

• Model.cs (modified) (2 diffs)
• Solver.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.LibSVM/1.6.3/LibSVM-1.6.3/Model.cs

@@ -33 +33 @@
     private int _numberOfClasses;
     private int _supportVectorCount;
+    private int[] _supportVectorIndizes;
     private Node[][] _supportVectors;
     private double[][] _supportVectorCoefficients;
@@ -78 +79 @@
       set {
         _supportVectorCount = value;
+      }
+    }
+
+    /// <summary>
+    /// Indizes of support vectors identified in the training.
+    /// </summary>
+    public int[] SupportVectorIndizes {
+      get {
+        return _supportVectorIndizes;
+      }
+      set {
+        _supportVectorIndizes = value;
       }
     }

trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.LibSVM/1.6.3/LibSVM-1.6.3/Solver.cs

@@ -1673 +1673 @@
                     if (Math.Abs(f.alpha[i]) > 0) ++nSV;                
                 model.SupportVectorCount = nSV;
+                model.SupportVectorIndizes = new int[nSV];
                 model.SupportVectors = new Node[nSV][];
                 model.SupportVectorCoefficients[0] = new double[nSV];
+                
                 int j = 0;
                 for (i = 0; i < prob.Count; i++)
@@ -1680 +1682 @@
                     {
                         model.SupportVectors[j] = prob.X[i];
+                        model.SupportVectorIndizes[j] = i;
                         model.SupportVectorCoefficients[0][j] = f.alpha[i];
+                       
                         ++j;
                     }
@@ -1820 +1824 @@
                 model.SupportVectorCount = nnz;
                 model.SupportVectors = new Node[nnz][];
+                model.SupportVectorIndizes = new int[nnz];
                 p = 0;
-                for (i = 0; i < l; i++)
-                    if (nonzero[i]) model.SupportVectors[p++] = x[i];
+                for (i = 0; i < l; i++) {
+                  if (nonzero[i]) {
+                    model.SupportVectors[p] = x[i];
+                    model.SupportVectorIndizes[p] = i;
+                    p++;
+                  }
+                }
 
                 int[] nz_start = new int[nr_class];