Changeset 14281 for branches/HeuristicLab.OSGAEvaluator

Timestamp:

09/15/16 10:16:17 (8 years ago)

Author:

bburlacu

Message:

#2635: Small cosmetic refactor.

File:

• branches/HeuristicLab.OSGAEvaluator/HeuristicLab.OSGAEvaluator/SymbolicRegressionSingleObjectiveOSGAEvaluator.cs (modified) (1 diff)

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

@@ -302 +302 @@
           calculator.Reset();
           // save estimated values into the list (for caching)
-          int j = i;
           int end = Math.Min(trainingPartitionSize, i + interval);
-          while (j < end && e.MoveNext()) {
+          for (int j = i; j < end && e.MoveNext(); ++j) {
             estimated.Add(e.Current);
-            j++;
           }
           var start = problemData.TrainingPartition.Start;
           // add (estimated, target) pairs to the calculator
-          for (j = 0; j < end; ++j) {
+          for (int 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) {
+          for (int j = end; j < trainingPartitionSize; ++j) {
             var index = j + start;
             var v = targetValues[index];