Changeset 4825 for trunk/sources/HeuristicLab.Optimization

Timestamp:

11/17/10 07:41:28 (14 years ago)

Author:

swagner

Message:

Fixed memory leak when using parameters whose values are not deeply cloned (#1268)

File:

• trunk/sources/HeuristicLab.Optimization/3.3/Run.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/Run.cs ¶

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -87 +88 @@
 
     private void Initialize(IAlgorithm algorithm) {
-      IAlgorithm clone = (IAlgorithm)algorithm.Clone();
       parameters = new Dictionary<string, IItem>();
       results = new Dictionary<string, IItem>();
-      clone.CollectParameterValues(parameters);
-      clone.CollectResultValues(results);
-      if (clone.StoreAlgorithmInEachRun) {
+
+      if (algorithm.StoreAlgorithmInEachRun) {
+        IAlgorithm clone = (IAlgorithm)algorithm.Clone();
+        clone.CollectParameterValues(parameters);
+        clone.CollectResultValues(results);
         clone.Prepare(true);
         this.algorithm = clone;
+      } else {
+        algorithm.CollectParameterValues(parameters);
+        algorithm.CollectResultValues(results);
+        Cloner cloner = new Cloner();
+        parameters = parameters.Select(x => new KeyValuePair<string, IItem>(x.Key, (IItem)x.Value.Clone(cloner))).ToDictionary(x => x.Key, x => x.Value);
+        results = results.Select(x => new KeyValuePair<string, IItem>(x.Key, (IItem)x.Value.Clone(cloner))).ToDictionary(x => x.Key, x => x.Value);
       }
     }