Changeset 4543 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/SupportVectorRegression/SupportVectorRegressionSolution.cs

Timestamp:

10/01/10 12:31:04 (14 years ago)

Author:

gkronber

Message:

Adapted SVM classes to work correctly for overlapping training / test partitions. #1226

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/SupportVectorRegression/SupportVectorRegressionSolution.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/SupportVectorRegression/SupportVectorRegressionSolution.cs

@@ -73 +73 @@
 
     protected override void RecalculateEstimatedValues() {
-      SVM.Problem problem = SupportVectorMachineUtil.CreateSvmProblem(ProblemData, 0, ProblemData.Dataset.Rows);
+      SVM.Problem problem = SupportVectorMachineUtil.CreateSvmProblem(ProblemData, Enumerable.Range(0, ProblemData.Dataset.Rows));
       SVM.Problem scaledProblem = Scaling.Scale(Model.RangeTransform, problem);
 
@@ -87 +87 @@
       get {
         if (estimatedValues == null) RecalculateEstimatedValues();
-        return estimatedValues.AsEnumerable();
+        return estimatedValues;
       }
     }
@@ -93 +93 @@
     public override IEnumerable<double> EstimatedTrainingValues {
       get {
-        if (estimatedValues == null) RecalculateEstimatedValues();
-        int start = ProblemData.TrainingSamplesStart.Value;
-        int n = ProblemData.TrainingSamplesEnd.Value - start;
-        return estimatedValues.Skip(start).Take(n).ToList();
+        return GetEstimatedValues(ProblemData.TrainingIndizes);
       }
     }
@@ -102 +99 @@
     public override IEnumerable<double> EstimatedTestValues {
       get {
-        if (estimatedValues == null) RecalculateEstimatedValues();
-        int start = ProblemData.TestSamplesStart.Value;
-        int n = ProblemData.TestSamplesEnd.Value - start;
-        return estimatedValues.Skip(start).Take(n).ToList();
+        return GetEstimatedValues(ProblemData.TestIndizes);
       }
+    }
+
+    private IEnumerable<double> GetEstimatedValues(IEnumerable<int> rows) {
+      if (estimatedValues == null) RecalculateEstimatedValues();
+      foreach (int row in rows)
+        yield return estimatedValues[row];
     }
   }