Changeset 4102 for trunk/sources/HeuristicLab.Optimization/3.3/Run.cs

Timestamp:

07/25/10 02:57:07 (14 years ago)

Author:

swagner

Message:

Enabled users to choose whether runs should contain a copy of their algorithm or not (#1105)

File:

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

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

@@ -90 +90 @@
       name = algorithm.Name + " Run (" + algorithm.ExecutionTime.ToString() + ")";
       description = ItemDescription;
-      Initialize((IAlgorithm)algorithm.Clone());
+      Initialize(algorithm);
     }
     public Run(string name, IAlgorithm algorithm)
@@ -96 +96 @@
       if (algorithm == null) throw new ArgumentNullException();
       description = ItemDescription;
-      Initialize((IAlgorithm)algorithm.Clone());
+      Initialize(algorithm);
     }
     public Run(string name, string description, IAlgorithm algorithm)
       : base(name, description) {
       if (algorithm == null) throw new ArgumentNullException();
-      Initialize((IAlgorithm)algorithm.Clone());
+      Initialize(algorithm);
     }
 
     private void Initialize(IAlgorithm algorithm) {
-      this.algorithm = algorithm;
+      IAlgorithm clone = (IAlgorithm)algorithm.Clone();
       parameters = new Dictionary<string, IItem>();
       results = new Dictionary<string, IItem>();
-      this.algorithm.CollectParameterValues(parameters);
-      this.algorithm.CollectResultValues(results);
-      this.algorithm.Prepare(true);
+      clone.CollectParameterValues(parameters);
+      clone.CollectResultValues(results);
+      if (clone.StoreAlgorithmInEachRun) {
+        clone.Prepare(true);
+        this.algorithm = clone;
+      }
     }