Changeset 3260 for trunk/sources/HeuristicLab.Optimization

Timestamp:

04/03/10 06:04:49 (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)
• BatchRun.cs (modified) (9 diffs)
• EngineAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)
• Interfaces/IAlgorithm.cs (modified) (2 diffs)
• Run.cs (added)
• RunCollection.cs (added)

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Drawing;
-using HeuristicLab.Collections;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -120 +120 @@
     }
 
+    public override void CollectParameterValues(IDictionary<string, IItem> values) {
+      base.CollectParameterValues(values);
+      Problem.CollectParameterValues(values);
+    }
+    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);
+    }
+
     #region Events
     public event EventHandler ProblemChanged;

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

@@ -22 +22 @@
 using System;
 using System.Drawing;
-using HeuristicLab.Collections;
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -74 +73 @@
 
     [Storable]
-    private ResultCollection results;
-    public ResultCollection Results {
-      get { return results; }
+    private RunCollection runs;
+    public RunCollection Runs {
+      get { return runs; }
     }
 
@@ -103 +102 @@
 
     public bool Finished {
-      get { return ((Algorithm == null) || (Algorithm.Finished && (results.Count >= repetitions))); }
+      get { return ((Algorithm == null) || (Algorithm.Finished && (runs.Count >= repetitions))); }
     }
 
@@ -111 +110 @@
       : base() {
       repetitions = 10;
-      results = new ResultCollection();
+      runs = new RunCollection();
       executionTime = TimeSpan.Zero;
     }
     public BatchRun(string name) : base(name) {
       repetitions = 10;
-      results = new ResultCollection();
+      runs = new RunCollection();
       executionTime = TimeSpan.Zero;
     }
     public BatchRun(string name, string description) : base(name, description) {
       repetitions = 10;
-      results = new ResultCollection();
+      runs = new RunCollection();
       executionTime = TimeSpan.Zero;
     }
@@ -129 +128 @@
       clone.Algorithm = (IAlgorithm)cloner.Clone(algorithm);
       clone.repetitions = repetitions;
-      clone.results = (ResultCollection)cloner.Clone(results);
+      clone.runs = (RunCollection)cloner.Clone(runs);
       clone.executionTime = executionTime;
       clone.running = running;
@@ -137 +136 @@
 
     public void Prepare() {
-      results.Clear();
+      executionTime = TimeSpan.Zero;
+      runs.Clear();
       if (Algorithm != null) Algorithm.Prepare();
       OnPrepared();
@@ -196 +196 @@
 
     private void DeregisterAlgorithmEvents() {
-      algorithm.Prepared -= new EventHandler(Algorithm_Prepared);
       algorithm.RunningChanged -= new EventHandler(Algorithm_RunningChanged);
       algorithm.ExceptionOccurred -= new EventHandler<HeuristicLab.Common.EventArgs<Exception>>(Algorithm_ExceptionOccurred);
@@ -202 +201 @@
 
     private void RegisterAlgorithmEvents() {
-      algorithm.Prepared += new EventHandler(Algorithm_Prepared);
       algorithm.RunningChanged += new EventHandler(Algorithm_RunningChanged);
       algorithm.ExceptionOccurred += new EventHandler<HeuristicLab.Common.EventArgs<Exception>>(Algorithm_ExceptionOccurred);
     }
 
-    private void Algorithm_Prepared(object sender, EventArgs e) {
-      results.Add(new Result("Run " + DateTime.Now.ToString(), Algorithm.Results));
-    }
     private void Algorithm_RunningChanged(object sender, EventArgs e) {
       if (Algorithm.Running) {
@@ -215 +210 @@
         OnStarted();
       } else {
-        if (!canceled && (results.Count < repetitions)) {
+        if (!canceled) {
           ExecutionTime += Algorithm.ExecutionTime;
+          runs.Add(new Run("Run " + Algorithm.ExecutionTime.ToString(), Algorithm));
           Algorithm.Prepare();
-          Algorithm.Start();
+          if (runs.Count < repetitions) Algorithm.Start();
+          else OnStopped();
         } else {
-          if (Algorithm.Finished) ExecutionTime += Algorithm.ExecutionTime;
           OnStopped();
         }

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

@@ -216 +216 @@
       Engine.ExceptionOccurred += new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred);
       Engine.ExecutionTimeChanged += new EventHandler(Engine_ExecutionTimeChanged);
-      Engine.Stopped += new EventHandler(Engine_Stopped);
+      Engine.RunningChanged += new EventHandler(Engine_RunningChanged);
     }
     private void DeregisterEngineEvents() {
       Engine.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(Engine_ExceptionOccurred);
       Engine.ExecutionTimeChanged -= new EventHandler(Engine_ExecutionTimeChanged);
-      Engine.Stopped -= new EventHandler(Engine_Stopped);
+      Engine.RunningChanged -= new EventHandler(Engine_RunningChanged);
     }
 
@@ -230 +230 @@
       OnExecutionTimeChanged();
     }
-    private void Engine_Stopped(object sender, EventArgs e) {
-      OnStopped();
+    private void Engine_RunningChanged(object sender, EventArgs e) {
+      if (!Engine.Running) OnStopped();
     }
   }

trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj ¶

@@ -87 +87 @@
     <Compile Include="Algorithm.cs" />
     <Compile Include="BatchRun.cs" />
+    <Compile Include="RunCollection.cs" />
+    <Compile Include="Run.cs" />
     <Compile Include="Interfaces\IMultiObjectiveSolutionsVisualizer.cs" />
     <Compile Include="Interfaces\IResult.cs" />

trunk/sources/HeuristicLab.Optimization/3.3/Interfaces/IAlgorithm.cs ¶

@@ -21 +21 @@
 
 using System;
-using HeuristicLab.Collections;
+using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -41 +41 @@
     void Stop();
 
+    void CollectResultValues(IDictionary<string, IItem> values);
+
     event EventHandler ProblemChanged;
     event EventHandler ExecutionTimeChanged;