Changeset 4469 for branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification.Views/3.3/ConfusionMatrixView.cs

Timestamp:

09/22/10 12:14:38 (14 years ago)

Author:

mkommend

Message:

Added logic to remove the test samples from the training samples (ticket #939).

File:

• branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification.Views/3.3/ConfusionMatrixView.cs (modified) (2 diffs)

branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification.Views/3.3/ConfusionMatrixView.cs

@@ -105 +105 @@
 
         double[,] confusionMatrix = new double[Content.ProblemData.NumberOfClasses, Content.ProblemData.NumberOfClasses];
-        int start;
-        int end;
+        IEnumerable<int> rows;
 
         if (cmbSamples.SelectedItem.ToString() == TrainingSamples) {
-          start = Content.ProblemData.TrainingSamplesStart.Value;
-          end = Content.ProblemData.TrainingSamplesEnd.Value;
+          rows = Content.ProblemData.TrainingIndizes;
         } else if (cmbSamples.SelectedItem.ToString() == TestSamples) {
-          start = Content.ProblemData.TestSamplesStart.Value;
-          end = Content.ProblemData.TestSamplesEnd.Value;
+          rows = Content.ProblemData.TestIndizes;
         } else throw new InvalidOperationException();
 
@@ -123 +120 @@
         }
 
-        double[] targetValues = Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable.Value, start, end);
-        double[] predictedValues = Content.EstimatedClassValues.Skip(start).Take(end - start).ToArray();
+        double[] targetValues = Content.ProblemData.Dataset.GetEnumeratedVariableValues(Content.ProblemData.TargetVariable.Value, rows).ToArray();
+        double[] predictedValues = Content.GetEstimatedClassValues(rows).ToArray();
 
         for (int i = 0; i < targetValues.Length; i++) {