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

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

@@ -134 +134 @@
 
     private void FillSeriesWithDataPoints(Series series) {
-      int row = Content.ProblemData.TrainingSamplesStart.Value;
-      foreach (double estimatedValue in Content.EstimatedTrainingValues) {
+      List<double> estimatedValues = Content.EstimatedValues.ToList();
+      foreach (int row in Content.ProblemData.TrainingIndizes) {
+        double estimatedValue = estimatedValues[row];
         double targetValue = Content.ProblemData.Dataset[Content.ProblemData.TargetVariable.Value, row];
-        if (targetValue == (double)series.Tag) {
+        if (targetValue.IsAlmost((double)series.Tag)) {
           double jitterValue = random.NextDouble() * 2.0 - 1.0;
           DataPoint point = new DataPoint();
@@ -145 +146 @@
           series.Points.Add(point);
         }
-        row++;
-      }
-
-      row = Content.ProblemData.TestSamplesStart.Value;
-      foreach (double estimatedValue in Content.EstimatedTestValues) {
+      }
+
+      foreach (int row in Content.ProblemData.TestIndizes) {
+        double estimatedValue = estimatedValues[row];
         double targetValue = Content.ProblemData.Dataset[Content.ProblemData.TargetVariable.Value, row];
         if (targetValue == (double)series.Tag) {
@@ -159 +159 @@
           series.Points.Add(point);
         }
-        row++;
-      }
+      }
+
       UpdateCursorInterval();
     }