Changeset 5279

Timestamp:

01/11/11 17:03:33 (14 years ago)

Author:

mkommend

Message:

Corrected validation range in ClassificationProblem (ticket #1373).

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Classification/3.3/Symbolic/SymbolicClassificationProblem.cs

@@ -123 +123 @@
       get { return new DoubleValue(10.0); }
     }
-    public IntValue TrainingSamplesStart { get { return new IntValue(ClassificationProblemData.TrainingSamplesStart.Value); } }
+    public IntValue TrainingSamplesStart { get { return new IntValue(ClassificationProblemData.TrainingIndizes.First()); } }
     public IntValue TrainingSamplesEnd {
-      get { return new IntValue((ClassificationProblemData.TrainingSamplesStart.Value + ClassificationProblemData.TrainingSamplesEnd.Value) / 2); }
+      get {
+        int endIndex = (int)(ClassificationProblemData.TrainingIndizes.Count() * (1.0 - ClassificationProblemData.ValidationPercentage.Value) - 1);
+        if (endIndex < 0) endIndex = 0;
+        return new IntValue(ClassificationProblemData.TrainingIndizes.ElementAt(endIndex));
+      }
     }
     public IntValue ValidationSamplesStart { get { return TrainingSamplesEnd; } }
-    public IntValue ValidationSamplesEnd { get { return new IntValue(ClassificationProblemData.TrainingSamplesEnd.Value); } }
+    public IntValue ValidationSamplesEnd { get { return new IntValue(ClassificationProblemData.TrainingIndizes.Last() + 1); } }
     public IntValue TestSamplesStart { get { return ClassificationProblemData.TestSamplesStart; } }
     public IntValue TestSamplesEnd { get { return ClassificationProblemData.TestSamplesEnd; } }