Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/15/11 15:51:55 (13 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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.ExtLibs

    • Property svn:mergeinfo set to (toggle deleted branches)
      /branches/DataAnalysis Refactoring/HeuristicLab.ExtLibsmergedeligible
      /branches/CloningRefactoring/HeuristicLab.ExtLibs4656-4721
      /branches/DataAnalysis/HeuristicLab.ExtLibs4458-4459,​4462,​4464
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.ExtLibs5060
      /branches/NET40/sources/HeuristicLab.ExtLibs5138-5162
      /branches/ParallelEngine/HeuristicLab.ExtLibs5175-5192
      /branches/SuccessProgressAnalysis/HeuristicLab.ExtLibs5370-5682
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.LibSVM/1.6.3/LibSVM-1.6.3/Model.cs

    r4545 r5692  
    3131    private int _numberOfClasses;
    3232    private int _supportVectorCount;
    33     private int[] _supportVectorIndizes;
    3433    private Node[][] _supportVectors;
    3534    private double[][] _supportVectorCoefficients;
     
    7776      set {
    7877        _supportVectorCount = value;
    79       }
    80     }
    81 
    82     /// <summary>
    83     /// Indizes of support vectors identified in the training.
    84     /// </summary>
    85     public int[] SupportVectorIndizes {
    86       get {
    87         return _supportVectorIndizes;
    88       }
    89       set {
    90         _supportVectorIndizes = value;
    9178      }
    9279    }
     
    215202      model.ClassLabels = null;
    216203      model.NumberOfSVPerClass = null;
    217       model.SupportVectorIndizes = new int[0];
    218204
    219205      bool headerFinished = false;
     
    416402        output.Write("nr_sv");
    417403        for (int i = 0; i < nr_class; i++)
    418           output.Write(" " + model.NumberOfSVPerClass[i].ToString("r"));
     404          output.Write(" " + model.NumberOfSVPerClass[i]);
    419405        output.Write(Environment.NewLine);
    420406      }
  • trunk/sources/HeuristicLab.ExtLibs/HeuristicLab.LibSVM/1.6.3/LibSVM-1.6.3/Solver.cs

    r4068 r5692  
    14601460          if (Math.Abs(f.alpha[i]) > 0) ++nSV;
    14611461        model.SupportVectorCount = nSV;
    1462         model.SupportVectorIndizes = new int[nSV];
    14631462        model.SupportVectors = new Node[nSV][];
    14641463        model.SupportVectorCoefficients[0] = new double[nSV];
     
    14681467          if (Math.Abs(f.alpha[i]) > 0) {
    14691468            model.SupportVectors[j] = prob.X[i];
    1470             model.SupportVectorIndizes[j] = i;
    14711469            model.SupportVectorCoefficients[0][j] = f.alpha[i];
    14721470
     
    15961594        model.SupportVectorCount = nnz;
    15971595        model.SupportVectors = new Node[nnz][];
    1598         model.SupportVectorIndizes = new int[nnz];
    15991596        p = 0;
    16001597        for (i = 0; i < l; i++) {
    16011598          if (nonzero[i]) {
    16021599            model.SupportVectors[p] = x[i];
    1603             model.SupportVectorIndizes[p] = i;
    16041600            p++;
    16051601          }
Note: See TracChangeset for help on using the changeset viewer.