Changeset 4469 for branches/HeuristicLab.Classification/HeuristicLab.Problems.DataAnalysis.Classification.Views/3.3/RocCurvesView.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/RocCurvesView.cs (modified) (2 diffs)

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

@@ -97 +97 @@
 
         int slices = 100;
-        int samplesStart = Content.ProblemData.TrainingSamplesStart.Value;
-        int samplesEnd = Content.ProblemData.TrainingSamplesEnd.Value;
+        IEnumerable<int> rows;
 
         if (cmbSamples.SelectedItem.ToString() == TrainingSamples) {
-          samplesStart = Content.ProblemData.TrainingSamplesStart.Value;
-          samplesEnd = Content.ProblemData.TrainingSamplesEnd.Value;
+          rows = Content.ProblemData.TrainingIndizes;
         } else if (cmbSamples.SelectedItem.ToString() == TestSamples) {
-          samplesStart = Content.ProblemData.TestSamplesStart.Value;
-          samplesEnd = Content.ProblemData.TestSamplesEnd.Value;
+          rows = Content.ProblemData.TestIndizes;
         } else throw new InvalidOperationException();
 
-        double[] estimatedValues = Content.EstimatedValues.Skip(samplesStart).Take(samplesEnd - samplesStart).ToArray();
-        double[] targetClassValues = Content.ProblemData.Dataset.GetVariableValues(Content.ProblemData.TargetVariable.Value)
-          .Skip(samplesStart).Take(samplesEnd - samplesStart).ToArray();
+        double[] estimatedValues = Content.GetEstimatedValues(rows).ToArray();
+        double[] targetClassValues = Content.ProblemData.Dataset.GetEnumeratedVariableValues(Content.ProblemData.TargetVariable.Value, rows).ToArray();
         double minThreshold = estimatedValues.Min();
         double maxThreshold = estimatedValues.Max();
@@ -122 +118 @@
           List<ROCPoint> rocPoints = new List<ROCPoint>();
           int positives = targetClassValues.Where(c => c.IsAlmost(classValue)).Count();
-          int negatives = samplesEnd - samplesStart - positives;
+          int negatives = targetClassValues.Length - positives;
 
           for (double lowerThreshold = minThreshold; lowerThreshold < maxThreshold; lowerThreshold += thresholdIncrement) {