Changeset 3280 for trunk/sources/HeuristicLab.Optimization/3.3/Algorithm.cs

Timestamp:

04/07/10 05:22:33 (14 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

File:

• trunk/sources/HeuristicLab.Optimization/3.3/Algorithm.cs (modified) (10 diffs)

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

@@ -64 +64 @@
     }
 
+    [Storable]
     private IProblem problem;
-    [Storable]
-    private IProblem ProblemPersistence {
-      get { return problem; }
-      set {
-        if (problem != null) DeregisterProblemEvents();
-        problem = value;
-        if (problem != null) RegisterProblemEvents();
-      }
-    }
     public IProblem Problem {
       get { return problem; }
@@ -91 +83 @@
 
     [Storable]
+    protected int runsCounter;
+
+    [Storable]
     private RunCollection runs;
     public RunCollection Runs {
@@ -100 +95 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runsCounter = 0;
       runs = new RunCollection();
     }
@@ -106 +102 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runsCounter = 0;
       runs = new RunCollection();
     }
@@ -112 +109 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runsCounter = 0;
       runs = new RunCollection();
     }
@@ -118 +116 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runsCounter = 0;
       runs = new RunCollection();
     }
@@ -124 +123 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
-      runs = new RunCollection();
+      runsCounter = 0;
+      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) { }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void Initialize() {
+      if (problem != null) RegisterProblemEvents();
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
+      if (ExecutionState == ExecutionState.Started) throw new InvalidOperationException(string.Format("Clone not allowed in execution state \"{0}\".", ExecutionState));
       Algorithm clone = (Algorithm)base.Clone(cloner);
       clone.executionState = executionState;
       clone.executionTime = executionTime;
-      clone.Problem = (IProblem)cloner.Clone(problem);
+      clone.problem = (IProblem)cloner.Clone(problem);
+      clone.runsCounter = runsCounter;
       clone.runs = (RunCollection)cloner.Clone(runs);
+      clone.Initialize();
       return clone;
     }
@@ -143 +162 @@
       if ((ExecutionState != ExecutionState.Prepared) && (ExecutionState != ExecutionState.Paused) && (ExecutionState != ExecutionState.Stopped))
         throw new InvalidOperationException(string.Format("Prepare not allowed in execution state \"{0}\".", ExecutionState));
-      if (clearRuns) runs.Clear();
+      if (clearRuns) {
+        runsCounter = 0;
+        runs.Clear();
+      }
       Prepare();
     }
@@ -165 +187 @@
     public virtual void CollectResultValues(IDictionary<string, IItem> values) {
       foreach (IResult result in Results)
-        values.Add(result.Name, result.Value != null ? (IItem)result.Value.Clone() : null);
+        values.Add(result.Name, result.Value);
     }
 
@@ -205 +227 @@
     public event EventHandler Stopped;
     protected virtual void OnStopped() {
-      Run run = new Run("Run (" + ExecutionTime.ToString() + ")");
-      CollectParameterValues(run.Parameters);
-      CollectResultValues(run.Results);
-      runs.Add(run);
       ExecutionState = ExecutionState.Stopped;
+      runsCounter++;
+      runs.Add(new Run(string.Format("{0} Run {1} ({2})", Name, runsCounter, ExecutionTime), this));
       EventHandler handler = Stopped;
       if (handler != null) handler(this, EventArgs.Empty);