Free cookie consent management tool by TermsFeed Policy Generator

Changeset 6182


Ignore:
Timestamp:
05/11/11 15:32:18 (12 years ago)
Author:
gkronber
Message:

#1523: fixed bug in fixed data analysis algorithms.

Location:
trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearDiscriminantAnalysis.cs

    r6002 r6182  
    6868      string targetVariable = problemData.TargetVariable;
    6969      IEnumerable<string> allowedInputVariables = problemData.AllowedInputVariables;
    70       int samplesStart = problemData.TrainingPartition.Start;
    71       int samplesEnd = problemData.TrainingPartition.End;
    72       IEnumerable<int> rows = Enumerable.Range(samplesStart, samplesEnd - samplesStart);
     70      IEnumerable<int> rows = problemData.TrainingIndizes;
    7371      int nClasses = problemData.ClassNames.Count();
    7472      double[,] inputMatrix = AlglibUtil.PrepareInputMatrix(dataset, allowedInputVariables.Concat(new string[] { targetVariable }), rows);
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearRegression.cs

    r6002 r6182  
    7272      string targetVariable = problemData.TargetVariable;
    7373      IEnumerable<string> allowedInputVariables = problemData.AllowedInputVariables;
    74       int samplesStart = problemData.TrainingPartition.Start;
    75       int samplesEnd = problemData.TrainingPartition.End;
    76       IEnumerable<int> rows = Enumerable.Range(samplesStart, samplesEnd - samplesStart);
     74      IEnumerable<int> rows = problemData.TrainingIndizes;
    7775      double[,] inputMatrix = AlglibUtil.PrepareInputMatrix(dataset, allowedInputVariables.Concat(new string[] { targetVariable }), rows);
    7876      if (inputMatrix.Cast<double>().Any(x => double.IsNaN(x) || double.IsInfinity(x)))
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorClassification.cs

    r5914 r6182  
    122122      Dataset dataset = problemData.Dataset;
    123123      string targetVariable = problemData.TargetVariable;
    124       int start = problemData.TrainingPartition.Start;
    125       int end = problemData.TrainingPartition.End;
    126       IEnumerable<int> rows = Enumerable.Range(start, end - start);
     124      IEnumerable<int> rows = problemData.TrainingIndizes;
    127125
    128126      //extract SVM parameters from scope and set them
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorRegression.cs

    r5914 r6182  
    130130      Dataset dataset = problemData.Dataset;
    131131      string targetVariable = problemData.TargetVariable;
    132       int start = problemData.TrainingPartition.Start;
    133       int end = problemData.TrainingPartition.End;
    134       IEnumerable<int> rows = Enumerable.Range(start, end - start);
     132      IEnumerable<int> rows = problemData.TrainingIndizes;
    135133
    136134      //extract SVM parameters from scope and set them
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/kMeans/KMeansClustering.cs

    r6002 r6182  
    8585      Dataset dataset = problemData.Dataset;
    8686      IEnumerable<string> allowedInputVariables = problemData.AllowedInputVariables;
    87       int start = problemData.TrainingPartition.Start;
    88       int end = problemData.TrainingPartition.End;
    89       IEnumerable<int> rows = Enumerable.Range(start, end - start);
     87      IEnumerable<int> rows = problemData.TrainingIndizes;
    9088      int info;
    9189      double[,] centers;
Note: See TracChangeset for help on using the changeset viewer.