Changeset 14311 for branches/HeuristicLab.Problems.GeneticProgramming.BloodGlucosePrediction/Solution.cs

Timestamp:

09/28/16 12:53:51 (8 years ago)

Author:

gkronber

Message:

simplification of grammar and problem and bug fixes related to precalculated smoothed features

File:

• branches/HeuristicLab.Problems.GeneticProgramming.BloodGlucosePrediction/Solution.cs (modified) (1 diff)

branches/HeuristicLab.Problems.GeneticProgramming.BloodGlucosePrediction/Solution.cs

@@ -132 +132 @@
     }
     public IEnumerable<double> EstimatedTrainingValues {
-      get { return GetEstimatedValues(ProblemData.TrainingIndices); }
+      get {
+        var all = EstimatedValues.ToArray();
+        return ProblemData.TrainingIndices.Select(r => all[r]);
+      }
     }
     public IEnumerable<double> EstimatedTestValues {
-      get { return GetEstimatedValues(ProblemData.TestIndices); }
+      get {
+        var all = EstimatedValues.ToArray();
+        return ProblemData.TestIndices.Select(r => all[r]);
+      }
     }
 
     public IEnumerable<double> GetEstimatedValues(IEnumerable<int> rows) {
-      return Model.GetEstimatedValues(ProblemData.Dataset, rows);
+      var all = Model.GetEstimatedValues(ProblemData.Dataset, ProblemData.AllIndices).ToArray();
+      return rows.Select(r => all[r]);
     }