Changeset 12128 for branches/TimeLimitRunOptimizer

Timestamp:

03/04/15 16:30:38 (10 years ago)

Author:

abeham

Message:

#1985: mkommend improved MakeSnapshot

File:

• branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs (modified) (1 diff)

branches/TimeLimitRunOptimizer/HeuristicLab.Optimization/3.3/MetaOptimizers/TimeLimitRun.cs

@@ -376 +376 @@
       string time = Math.Round(ExecutionTime.TotalSeconds, 1).ToString("0.0");
       string runName = "Snapshot " + time + "s " + algorithm.Name;
-      Run run;
-      if (StoreAlgorithmInEachSnapshot) {
-        var temporarilySetStoreFlag = !Algorithm.StoreAlgorithmInEachRun;
-        if (temporarilySetStoreFlag) Algorithm.StoreAlgorithmInEachRun = true;
-        run = new Run(runName, Algorithm);
-        if (temporarilySetStoreFlag) Algorithm.StoreAlgorithmInEachRun = false;
-      } else {
-        // duplicate code of Run.Initialize - necessary, because Algorithm property doesn't have a setter
-        run = new Run() { Name = runName };
-        var parameters = new Dictionary<string, IItem>();
-        var results = new Dictionary<string, IItem>();
-        algorithm.CollectParameterValues(parameters);
-        algorithm.CollectResultValues(results);
-        var cloner = new Cloner();
-        foreach (var kvp in parameters.Select(x => new KeyValuePair<string, IItem>(x.Key, cloner.Clone(x.Value))).ToDictionary(x => x.Key, x => x.Value))
-          run.Parameters.Add(kvp);
-        foreach (var kvp in results.Select(x => new KeyValuePair<string, IItem>(x.Key, cloner.Clone(x.Value))).ToDictionary(x => x.Key, x => x.Value))
-          run.Results.Add(kvp);
-      }
+      var changed = false;
+      if (StoreAlgorithmInEachSnapshot && !Algorithm.StoreAlgorithmInEachRun) {
+        Algorithm.StoreAlgorithmInEachRun = true;
+        changed = true;
+      } else if (!StoreAlgorithmInEachSnapshot && Algorithm.StoreAlgorithmInEachRun) {
+        Algorithm.StoreAlgorithmInEachRun = false;
+        changed = true;
+      }
+      var run = new Run(runName, Algorithm);
+      if (changed)
+        Algorithm.StoreAlgorithmInEachRun = !Algorithm.StoreAlgorithmInEachRun;
+
       snapshots.Add(run);
     }