Changeset 3286 for trunk/sources/HeuristicLab.Optimization/3.3

Timestamp:

04/08/10 02:21:50 (15 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• Algorithm.cs (modified) (2 diffs)
• EngineAlgorithm.cs (modified) (2 diffs)
• UserDefinedAlgorithm.cs (modified) (1 diff)

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

@@ -126 +126 @@
       runs = new RunCollection();
     }
-    internal Algorithm(Algorithm algorithm, Cloner cloner)
-      : base(algorithm.Name, algorithm.Description, (ParameterCollection)cloner.Clone(algorithm.Parameters)) {
-      executionState = algorithm.executionState;
-      executionTime = algorithm.executionTime;
-      problem = (IProblem)cloner.Clone(algorithm.problem);
-      runsCounter = algorithm.runsCounter;
-      runs = (RunCollection)cloner.Clone(algorithm.runs);
-      Initialize();
-    }
     [StorableConstructor]
     protected Algorithm(bool deserializing) : base(deserializing) { }
@@ -154 +145 @@
       return clone;
     }
+    protected virtual void Clone(IDeepCloneable clone, Cloner cloner) {
+      Algorithm algorithm = clone as Algorithm;
+      if (algorithm != null) {
+        algorithm.name = name;
+        algorithm.description = description;
+        foreach (IParameter param in Parameters)
+          algorithm.Parameters.Add((IParameter)cloner.Clone(param));
+        algorithm.executionState = executionState;
+        algorithm.executionTime = executionTime;
+        algorithm.problem = (IProblem)cloner.Clone(problem);
+        algorithm.runsCounter = runsCounter;
+        algorithm.runs = (RunCollection)cloner.Clone(runs);
+        algorithm.Initialize();
+      }
+    }
 
     public virtual void Prepare() {

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

@@ -112 +112 @@
       Initialize();
     }
-    internal EngineAlgorithm(EngineAlgorithm algorithm, Cloner cloner)
-      : base(algorithm, cloner) {
-      globalScope = (IScope)cloner.Clone(algorithm.globalScope);
-      operatorGraph = (OperatorGraph)cloner.Clone(algorithm.operatorGraph);
-      engine = (IEngine)cloner.Clone(algorithm.engine);
-      Initialize();
-    }
     [StorableConstructor]
     protected EngineAlgorithm(bool deserializing) : base(deserializing) { }
@@ -142 +135 @@
       return clone;
     }
+    protected override void Clone(IDeepCloneable clone, Cloner cloner) {
+      base.Clone(clone, cloner);
+      EngineAlgorithm algorithm = clone as EngineAlgorithm;
+      if (algorithm != null) {
+        algorithm.globalScope = (IScope)cloner.Clone(globalScope);
+        algorithm.engine = (IEngine)cloner.Clone(engine);
+        algorithm.operatorGraph = (OperatorGraph)cloner.Clone(operatorGraph);
+        algorithm.Initialize();
+      }
+    }
 
     public UserDefinedAlgorithm CreateUserDefinedAlgorithm() {
-      return new UserDefinedAlgorithm(this, new Cloner());
+      UserDefinedAlgorithm algorithm = new UserDefinedAlgorithm();
+      Cloner cloner = new Cloner();
+      cloner.RegisterClonedObject(this, algorithm);
+      Clone(algorithm, cloner);
+      return algorithm;
     }
 

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

@@ -52 +52 @@
     public UserDefinedAlgorithm(string name) : base(name) { }
     public UserDefinedAlgorithm(string name, string description) : base(name, description) { }
-    internal UserDefinedAlgorithm(EngineAlgorithm algorithm, Cloner cloner) : base(algorithm, cloner) { }
     [StorableConstructor]
     private UserDefinedAlgorithm(bool deserializing) : base(deserializing) { }