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

Timestamp:

04/06/10 03:37:29 (14 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

File:

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

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

@@ -90 +90 @@
     public abstract ResultCollection Results { get; }
 
+    [Storable]
+    private RunCollection runs;
+    public RunCollection Runs {
+      get { return runs; }
+    }
+
     protected Algorithm()
       : base() {
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runs = new RunCollection();
     }
     protected Algorithm(string name)
@@ -99 +106 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runs = new RunCollection();
     }
     protected Algorithm(string name, ParameterCollection parameters)
@@ -104 +112 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runs = new RunCollection();
     }
     protected Algorithm(string name, string description)
@@ -109 +118 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runs = new RunCollection();
     }
     protected Algorithm(string name, string description, ParameterCollection parameters)
@@ -114 +124 @@
       executionState = ExecutionState.Stopped;
       executionTime = TimeSpan.Zero;
+      runs = new RunCollection();
     }
 
@@ -121 +132 @@
       clone.executionTime = executionTime;
       clone.Problem = (IProblem)cloner.Clone(problem);
+      clone.runs = (RunCollection)cloner.Clone(runs);
       return clone;
     }
 
-    public void Prepare() {
-      Prepare(true);
-    }
-    public virtual void Prepare(bool clearResults) {
+    public virtual void Prepare() {
       if ((ExecutionState != ExecutionState.Prepared) && (ExecutionState != ExecutionState.Paused) && (ExecutionState != ExecutionState.Stopped))
         throw new InvalidOperationException(string.Format("Prepare not allowed in execution state \"{0}\".", ExecutionState));
-      ExecutionTime = TimeSpan.Zero;
+    }
+    public void Prepare(bool clearRuns) {
+      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();
+      Prepare();
     }
     public virtual void Start() {
@@ -172 +186 @@
     public event EventHandler Prepared;
     protected virtual void OnPrepared() {
+      ExecutionTime = TimeSpan.Zero;
       ExecutionState = ExecutionState.Prepared;
       EventHandler handler = Prepared;
@@ -190 +205 @@
     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;
       EventHandler handler = Stopped;