Changeset 8167 for trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression

Timestamp:

06/30/12 17:05:23 (12 years ago)

Author:

gkronber

Message:

#1720 reused evaluationCache from base classes in EnsembleSolutions

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs (modified) (9 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionEnsembleSolution.cs

@@ -37 +37 @@
   [Creatable("Data Analysis - Ensembles")]
   public sealed class RegressionEnsembleSolution : RegressionSolution, IRegressionEnsembleSolution {
-    private readonly Dictionary<int, double> trainingEstimatedValuesCache = new Dictionary<int, double>();
-    private readonly Dictionary<int, double> testEstimatedValuesCache = new Dictionary<int, double>();
-    private readonly Dictionary<int, double> estimatedValuesCache = new Dictionary<int, double>();
+    private readonly Dictionary<int, double> trainingEvaluationCache = new Dictionary<int, double>();
+    private readonly Dictionary<int, double> testEvaluationCache = new Dictionary<int, double>();
 
     public new IRegressionEnsembleModel Model {
@@ -158 +157 @@
       get {
         var rows = ProblemData.TrainingIndices;
-        var rowsToEvaluate = rows.Except(trainingEstimatedValuesCache.Keys);
+        var rowsToEvaluate = rows.Except(trainingEvaluationCache.Keys);
         var rowsEnumerator = rowsToEvaluate.GetEnumerator();
         var valuesEnumerator = GetEstimatedValues(rowsToEvaluate, (r, m) => RowIsTrainingForModel(r, m) && !RowIsTestForModel(r, m)).GetEnumerator();
 
         while (rowsEnumerator.MoveNext() & valuesEnumerator.MoveNext()) {
-          trainingEstimatedValuesCache.Add(rowsEnumerator.Current, valuesEnumerator.Current);
+          trainingEvaluationCache.Add(rowsEnumerator.Current, valuesEnumerator.Current);
         }
 
-        return rows.Select(row => trainingEstimatedValuesCache[row]);
+        return rows.Select(row => trainingEvaluationCache[row]);
       }
     }
@@ -173 +172 @@
       get {
         var rows = ProblemData.TestIndices;
-        var rowsToEvaluate = rows.Except(testEstimatedValuesCache.Keys);
+        var rowsToEvaluate = rows.Except(testEvaluationCache.Keys);
         var rowsEnumerator = rowsToEvaluate.GetEnumerator();
         var valuesEnumerator = GetEstimatedValues(rowsToEvaluate, RowIsTestForModel).GetEnumerator();
 
         while (rowsEnumerator.MoveNext() & valuesEnumerator.MoveNext()) {
-          testEstimatedValuesCache.Add(rowsEnumerator.Current, valuesEnumerator.Current);
+          testEvaluationCache.Add(rowsEnumerator.Current, valuesEnumerator.Current);
         }
 
-        return rows.Select(row => testEstimatedValuesCache[row]);
+        return rows.Select(row => testEvaluationCache[row]);
       }
     }
@@ -213 +212 @@
 
     public override IEnumerable<double> GetEstimatedValues(IEnumerable<int> rows) {
-      var rowsToEvaluate = rows.Except(estimatedValuesCache.Keys);
+      var rowsToEvaluate = rows.Except(evaluationCache.Keys);
       var rowsEnumerator = rowsToEvaluate.GetEnumerator();
       var valuesEnumerator = (from xs in GetEstimatedValueVectors(ProblemData.Dataset, rowsToEvaluate)
@@ -220 +219 @@
 
       while (rowsEnumerator.MoveNext() & valuesEnumerator.MoveNext()) {
-        estimatedValuesCache.Add(rowsEnumerator.Current, valuesEnumerator.Current);
-      }
-
-      return rows.Select(row => estimatedValuesCache[row]);
+        evaluationCache.Add(rowsEnumerator.Current, valuesEnumerator.Current);
+      }
+
+      return rows.Select(row => evaluationCache[row]);
     }
 
@@ -244 +243 @@
 
     protected override void OnProblemDataChanged() {
-      trainingEstimatedValuesCache.Clear();
-      testEstimatedValuesCache.Clear();
-      estimatedValuesCache.Clear();
+      trainingEvaluationCache.Clear();
+      testEvaluationCache.Clear();
+      evaluationCache.Clear();
       IRegressionProblemData problemData = new RegressionProblemData(ProblemData.Dataset,
                                                                      ProblemData.AllowedInputVariables,
@@ -276 +275 @@
       regressionSolutions.AddRange(solutions);
 
-      trainingEstimatedValuesCache.Clear();
-      testEstimatedValuesCache.Clear();
-      estimatedValuesCache.Clear();
+      trainingEvaluationCache.Clear();
+      testEvaluationCache.Clear();
+      evaluationCache.Clear();
     }
     public void RemoveRegressionSolutions(IEnumerable<IRegressionSolution> solutions) {
       regressionSolutions.RemoveRange(solutions);
 
-      trainingEstimatedValuesCache.Clear();
-      testEstimatedValuesCache.Clear();
-      estimatedValuesCache.Clear();
+      trainingEvaluationCache.Clear();
+      testEvaluationCache.Clear();
+      evaluationCache.Clear();
     }
 
@@ -308 +307 @@
       testPartitions[solution.Model] = solution.ProblemData.TestPartition;
 
-      trainingEstimatedValuesCache.Clear();
-      testEstimatedValuesCache.Clear();
-      estimatedValuesCache.Clear();
+      trainingEvaluationCache.Clear();
+      testEvaluationCache.Clear();
+      evaluationCache.Clear();
     }
 
@@ -319 +318 @@
       testPartitions.Remove(solution.Model);
 
-      trainingEstimatedValuesCache.Clear();
-      testEstimatedValuesCache.Clear();
-      estimatedValuesCache.Clear();
+      trainingEvaluationCache.Clear();
+      testEvaluationCache.Clear();
+      evaluationCache.Clear();
     }
   }