Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/27/12 17:34:17 (13 years ago)
Author:
mkommend
Message:

#1722: Renamed indizes to indices in the whole trunk solution.

Location:
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationEnsembleSolutionEstimatedClassValuesView.cs

    r7259 r8139  
    7373      }
    7474
    75       int[] indizes;
     75      int[] indices;
    7676      double[] estimatedClassValues;
    7777
    7878      switch (SamplesComboBox.SelectedItem.ToString()) {
    7979        case SamplesComboBoxAllSamples: {
    80             indizes = Enumerable.Range(0, Content.ProblemData.Dataset.Rows).ToArray();
     80            indices = Enumerable.Range(0, Content.ProblemData.Dataset.Rows).ToArray();
    8181            estimatedClassValues = Content.EstimatedClassValues.ToArray();
    8282            break;
    8383          }
    8484        case SamplesComboBoxTrainingSamples: {
    85             indizes = Content.ProblemData.TrainingIndizes.ToArray();
     85            indices = Content.ProblemData.TrainingIndices.ToArray();
    8686            estimatedClassValues = Content.EstimatedTrainingClassValues.ToArray();
    8787            break;
    8888          }
    8989        case SamplesComboBoxTestSamples: {
    90             indizes = Content.ProblemData.TestIndizes.ToArray();
     90            indices = Content.ProblemData.TestIndices.ToArray();
    9191            estimatedClassValues = Content.EstimatedTestClassValues.ToArray();
    9292            break;
     
    9898      int classValuesCount = Content.ProblemData.ClassValues.Count;
    9999      int solutionsCount = Content.ClassificationSolutions.Count();
    100       string[,] values = new string[indizes.Length, 5 + classValuesCount + solutionsCount];
     100      string[,] values = new string[indices.Length, 5 + classValuesCount + solutionsCount];
    101101      double[] target = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable).ToArray();
    102       List<List<double?>> estimatedValuesVector = GetEstimatedValues(SamplesComboBox.SelectedItem.ToString(), indizes,
     102      List<List<double?>> estimatedValuesVector = GetEstimatedValues(SamplesComboBox.SelectedItem.ToString(), indices,
    103103                                                            Content.ClassificationSolutions);
    104104
    105       for (int i = 0; i < indizes.Length; i++) {
    106         int row = indizes[i];
     105      for (int i = 0; i < indices.Length; i++) {
     106        int row = indices[i];
    107107        values[i, 0] = row.ToString();
    108108        values[i, 1] = target[i].ToString();
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionConfusionMatrixView.cs

    r7259 r8139  
    107107        double[] predictedValues;
    108108        if (cmbSamples.SelectedItem.ToString() == TrainingSamples) {
    109           rows = Content.ProblemData.TrainingIndizes;
     109          rows = Content.ProblemData.TrainingIndices;
    110110          predictedValues = Content.EstimatedTrainingClassValues.ToArray();
    111111        } else if (cmbSamples.SelectedItem.ToString() == TestSamples) {
    112           rows = Content.ProblemData.TestIndizes;
     112          rows = Content.ProblemData.TestIndices;
    113113          predictedValues = Content.EstimatedTestClassValues.ToArray();
    114114        } else throw new InvalidOperationException();
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionEstimatedClassValuesView.cs

    r7259 r8139  
    9696          var estimatedTraining = Content.EstimatedTrainingClassValues.GetEnumerator();
    9797          estimatedTraining.MoveNext();
    98           foreach (var trainingRow in Content.ProblemData.TrainingIndizes) {
     98          foreach (var trainingRow in Content.ProblemData.TrainingIndices) {
    9999            values[trainingRow, 3] = estimatedTraining.Current.ToString();
    100100            estimatedTraining.MoveNext();
     
    102102          var estimatedTest = Content.EstimatedTestClassValues.GetEnumerator();
    103103          estimatedTest.MoveNext();
    104           foreach (var testRow in Content.ProblemData.TestIndizes) {
     104          foreach (var testRow in Content.ProblemData.TestIndices) {
    105105            values[testRow, 4] = estimatedTest.Current.ToString();
    106106            estimatedTest.MoveNext();
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationRocCurvesView.cs

    r7259 r8139  
    101101
    102102        if (cmbSamples.SelectedItem.ToString() == TrainingSamples) {
    103           rows = Content.ProblemData.TrainingIndizes;
     103          rows = Content.ProblemData.TrainingIndices;
    104104        } else if (cmbSamples.SelectedItem.ToString() == TestSamples) {
    105           rows = Content.ProblemData.TestIndizes;
     105          rows = Content.ProblemData.TestIndices;
    106106        } else throw new InvalidOperationException();
    107107
  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionThresholdView.cs

    r7259 r8139  
    137137      var targetValues = Content.ProblemData.Dataset.GetDoubleValues(Content.ProblemData.TargetVariable).ToList();
    138138
    139       foreach (int row in Content.ProblemData.TrainingIndizes) {
     139      foreach (int row in Content.ProblemData.TrainingIndices) {
    140140        double estimatedValue = estimatedValues[row];
    141141        double targetValue = targetValues[row];
     
    150150      }
    151151
    152       foreach (int row in Content.ProblemData.TestIndizes) {
     152      foreach (int row in Content.ProblemData.TestIndices) {
    153153        double estimatedValue = estimatedValues[row];
    154154        double targetValue = targetValues[row];
Note: See TracChangeset for help on using the changeset viewer.