Changeset 14280

Timestamp:

09/14/16 16:56:57 (8 years ago)

Author:

bburlacu

Message:

#2635: Small refactor.

File:

• branches/HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/SymbolicRegressionSingleObjectiveOSGAEvaluator.cs (modified) (4 diffs)

branches/HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/SymbolicRegressionSingleObjectiveOSGAEvaluator.cs

@@ -206 +206 @@
       var e = estimatedValues.GetEnumerator();
 
+      #region fixed intervals
       if (UseFixedEvaluationIntervals) {
         double threshold = parentQuality * RelativeParentChildQualityThreshold;
@@ -289 +290 @@
           return actualQuality;
         }
+        #endregion
       } else {
         var calculator = new OnlinePearsonsRCalculator();
@@ -298 +300 @@
         // if the quality of the individual still falls below the parent quality, then we can reject it sooner, otherwise as i increases the whole estimated series will be used
         for (int i = 0; i < trainingPartitionSize; i += interval) {
+          calculator.Reset();
+          // save estimated values into the list (for caching)
           int j = i;
           int end = Math.Min(trainingPartitionSize, i + interval);
@@ -304 +308 @@
             j++;
           }
-
           var start = problemData.TrainingPartition.Start;
-          calculator.Reset();
           // add (estimated, target) pairs to the calculator
-          for (j = 0; j < end; ++j)
-            calculator.Add(estimated[j], targetValues[j + start]);
+          for (j = 0; j < end; ++j) {
+            var index = j + start;
+            calculator.Add(targetValues[index], estimated[j]);
+          }
           // add (target, target) pairs to the calculator (simulate perfect correlation on the remaining rows)
           for (; j < trainingPartitionSize; ++j) {
             var index = j + start;
-            calculator.Add(targetValues[index], targetValues[index]);
+            var v = targetValues[index];
+            calculator.Add(v, v);
           }
           var r = calculator.ErrorState == OnlineCalculatorError.None ? calculator.R : double.NaN;