Changeset 5692 for trunk/sources/HeuristicLab.ExtLibs

Timestamp:

03/15/11 15:51:55 (14 years ago)

Author:

gkronber

Message:

#1426 merged r5690 from data analysis refactoring branch (see #1418) into trunk to fix persistence problems of SVMs.

Location:

trunk/sources/HeuristicLab.ExtLibs

Files:

• . (modified) (1 prop)
• HeuristicLab.LibSVM/1.6.3/LibSVM-1.6.3/Model.cs (modified) (4 diffs)
• HeuristicLab.LibSVM/1.6.3/LibSVM-1.6.3/Solver.cs (modified) (3 diffs)

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

@@ -31 +31 @@
     private int _numberOfClasses;
     private int _supportVectorCount;
-    private int[] _supportVectorIndizes;
     private Node[][] _supportVectors;
     private double[][] _supportVectorCoefficients;
@@ -77 +76 @@
       set {
         _supportVectorCount = value;
-      }
-    }
-
-    /// <summary>
-    /// Indizes of support vectors identified in the training.
-    /// </summary>
-    public int[] SupportVectorIndizes {
-      get {
-        return _supportVectorIndizes;
-      }
-      set {
-        _supportVectorIndizes = value;
       }
     }
@@ -215 +202 @@
       model.ClassLabels = null;
       model.NumberOfSVPerClass = null;
-      model.SupportVectorIndizes = new int[0];
 
       bool headerFinished = false;
@@ -416 +402 @@
         output.Write("nr_sv");
         for (int i = 0; i < nr_class; i++)
-          output.Write(" " + model.NumberOfSVPerClass[i].ToString("r"));
+          output.Write(" " + model.NumberOfSVPerClass[i]);
         output.Write(Environment.NewLine);
       }

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

@@ -1460 +1460 @@
           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];
@@ -1468 +1467 @@
           if (Math.Abs(f.alpha[i]) > 0) {
             model.SupportVectors[j] = prob.X[i];
-            model.SupportVectorIndizes[j] = i;
             model.SupportVectorCoefficients[0][j] = f.alpha[i];
 
@@ -1596 +1594 @@
         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];
-            model.SupportVectorIndizes[p] = i;
             p++;
           }