Changeset 12890 for branches/PerformanceComparison/HeuristicLab.Analysis/3.3

Timestamp:

08/21/15 22:18:16 (9 years ago)

Author:

abeham

Message:

#2431: fixed a bug in the iterated algorithm

File:

• branches/PerformanceComparison/HeuristicLab.Analysis/3.3/Optimizers/IteratedAlgorithm.cs (modified) (2 diffs)

branches/PerformanceComparison/HeuristicLab.Analysis/3.3/Optimizers/IteratedAlgorithm.cs

@@ -383 +383 @@
           }
         }
-        if (improvement) {
-          var totalExecTime = execTime + perClock.Rows.First().Values.Last().Item1;
-          qualityValues.Add(Tuple.Create(totalExecTime, best));
-          restartValues.Add(Tuple.Create(totalExecTime, (double)restarts));
-        }
+        if (!improvement) {
+          qualityValues.RemoveAt(qualityValues.Count - 1);
+          restartValues.RemoveAt(restartValues.Count - 1);
+        }
+        var totalExecTime = execTime + perClock.Rows.First().Values.Last().Item1;
+        qualityValues.Add(Tuple.Create(totalExecTime, best));
+        restartValues.Add(Tuple.Create(totalExecTime, (double)restarts));
       }
     }
@@ -425 +427 @@
           }
         }
-        if (improvement) { // add the best quality again as value with highest evaluations
-          var totalEvaluations = evaluations + perEvaluations.Rows.First().Values.Last().Item1;
-          qualityValues.Add(Tuple.Create(totalEvaluations, best));
-          restartValues.Add(Tuple.Create(totalEvaluations, (double)restarts));
-        }
+        if (!improvement) {
+          // add the best quality again as value with highest evaluations
+          qualityValues.RemoveAt(qualityValues.Count - 1);
+          restartValues.RemoveAt(restartValues.Count - 1);
+        }
+        var totalEvaluations = evaluations + perEvaluations.Rows.First().Values.Last().Item1;
+        qualityValues.Add(Tuple.Create(totalEvaluations, best));
+        restartValues.Add(Tuple.Create(totalEvaluations, (double)restarts));
       }
     }