Changeset 3275 for trunk/sources/HeuristicLab.Optimization

Timestamp:

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

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• Algorithm.cs (modified) (8 diffs)
• BatchRun.cs (modified) (8 diffs)
• EngineAlgorithm.cs (modified) (1 diff)
• Experiment.cs (modified) (9 diffs)
• Interfaces/IOptimizer.cs (modified) (1 diff)
• Run.cs (modified) (1 diff)

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;

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

@@ -25 +25 @@
 using HeuristicLab.Core;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Collections;
 
 namespace HeuristicLab.Optimization {
@@ -83 +84 @@
           if (algorithm != null) RegisterAlgorithmEvents();
           OnAlgorithmChanged();
-          Prepare();
+          Prepare(true);
         }
       }
@@ -97 +98 @@
           OnRepetitionsChanged();
           if ((runs.Count < repetitions) && (Algorithm != null) && (Algorithm.ExecutionState == ExecutionState.Stopped))
-            Prepare(false);
+            Prepare();
         }
       }
@@ -145 +146 @@
 
     public void Prepare() {
-      Prepare(true);
-    }
-    public void Prepare(bool clearResults) {
+      Prepare(false);
+    }
+    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 (Algorithm != null) {
-        if (clearResults) {
+        if (clearRuns) {
           ExecutionTime = TimeSpan.Zero;
           runs.Clear();
         }
-        Algorithm.Prepare();
+        Algorithm.Prepare(clearRuns);
       }
     }
@@ -233 +234 @@
       algorithm.Started += new EventHandler(Algorithm_Started);
       algorithm.Stopped += new EventHandler(Algorithm_Stopped);
+      algorithm.Runs.CollectionReset += new CollectionItemsChangedEventHandler<Run>(Algorithm_Runs_CollectionReset);
+      algorithm.Runs.ItemsAdded += new CollectionItemsChangedEventHandler<Run>(Algorithm_Runs_ItemsAdded);
+      algorithm.Runs.ItemsRemoved += new CollectionItemsChangedEventHandler<Run>(Algorithm_Runs_ItemsRemoved);
     }
     private void DeregisterAlgorithmEvents() {
@@ -241 +245 @@
       algorithm.Started -= new EventHandler(Algorithm_Started);
       algorithm.Stopped -= new EventHandler(Algorithm_Stopped);
-    }
-
+      algorithm.Runs.CollectionReset -= new CollectionItemsChangedEventHandler<Run>(Algorithm_Runs_CollectionReset);
+      algorithm.Runs.ItemsAdded -= new CollectionItemsChangedEventHandler<Run>(Algorithm_Runs_ItemsAdded);
+      algorithm.Runs.ItemsRemoved -= new CollectionItemsChangedEventHandler<Run>(Algorithm_Runs_ItemsRemoved);
+    }
     private void Algorithm_ExceptionOccurred(object sender, EventArgs<Exception> e) {
       OnExceptionOccurred(e.Value);
@@ -261 +267 @@
     private void Algorithm_Stopped(object sender, EventArgs e) {
       ExecutionTime += Algorithm.ExecutionTime;
-      runs.Add(new Run("Run " + Algorithm.ExecutionTime.ToString(), Algorithm));
       OnStopped();
 
@@ -269 +274 @@
       }
     }
+    private void Algorithm_Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<Run> e) {
+      Runs.RemoveRange(e.OldItems);
+      Runs.AddRange(e.Items);
+    }
+    private void Algorithm_Runs_ItemsAdded(object sender, CollectionItemsChangedEventArgs<Run> e) {
+      Runs.AddRange(e.Items);
+    }
+    private void Algorithm_Runs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<Run> e) {
+      Runs.RemoveRange(e.Items);
+    }
     #endregion
   }

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

@@ -157 +157 @@
     }
 
-    public override void Prepare(bool clearResults) {
-      base.Prepare(clearResults);
-
-      ResultCollection results = Results;
+    public override void Prepare() {
+      base.Prepare();
       globalScope.Clear();
-      if (clearResults)
-        globalScope.Variables.Add(new Variable("Results", new ResultCollection()));
-      else
-        globalScope.Variables.Add(new Variable("Results", results));
+      globalScope.Variables.Add(new Variable("Results", new ResultCollection()));
 
       if (engine != null) {

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

@@ -77 +77 @@
     }
 
+    [Storable]
+    private RunCollection runs;
+    public RunCollection Runs {
+      get { return runs; }
+    }
+
     private bool stopPending;
 
@@ -84 +90 @@
       executionTime = TimeSpan.Zero;
       Optimizers = new OptimizerList();
+      runs = new RunCollection();
       stopPending = false;
     }
@@ -90 +97 @@
       executionTime = TimeSpan.Zero;
       Optimizers = new OptimizerList();
+      runs = new RunCollection();
       stopPending = false;
     }
@@ -96 +104 @@
       executionTime = TimeSpan.Zero;
       Optimizers = new OptimizerList();
+      runs = new RunCollection();
       stopPending = false;
     }
@@ -104 +113 @@
       clone.executionTime = executionTime;
       clone.Optimizers = (OptimizerList)cloner.Clone(optimizers);
+      clone.runs = (RunCollection)cloner.Clone(runs);
       clone.stopPending = stopPending;
       return clone;
@@ -109 +119 @@
 
     public void Prepare() {
-      Prepare(true);
-    }
-    public void Prepare(bool clearResults) {
+      Prepare(false);
+    }
+    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 (Optimizers.Count > 0) {
+        if (clearRuns) runs.Clear();
         foreach (IOptimizer optimizer in Optimizers.Where(x => x.ExecutionState != ExecutionState.Started))
-          optimizer.Prepare(clearResults);
+          optimizer.Prepare(clearRuns);
       }
     }
@@ -233 +244 @@
       optimizer.Started += new EventHandler(optimizer_Started);
       optimizer.Stopped += new EventHandler(optimizer_Stopped);
-    }
-
+      optimizer.Runs.CollectionReset += new CollectionItemsChangedEventHandler<Run>(optimizer_Runs_CollectionReset);
+      optimizer.Runs.ItemsAdded += new CollectionItemsChangedEventHandler<Run>(optimizer_Runs_ItemsAdded);
+      optimizer.Runs.ItemsRemoved += new CollectionItemsChangedEventHandler<Run>(optimizer_Runs_ItemsRemoved);
+    }
     private void DeregisterOptimizerEvents(IOptimizer optimizer) {
       optimizer.ExceptionOccurred -= new EventHandler<EventArgs<Exception>>(optimizer_ExceptionOccurred);
@@ -242 +255 @@
       optimizer.Started -= new EventHandler(optimizer_Started);
       optimizer.Stopped -= new EventHandler(optimizer_Stopped);
+      optimizer.Runs.CollectionReset -= new CollectionItemsChangedEventHandler<Run>(optimizer_Runs_CollectionReset);
+      optimizer.Runs.ItemsAdded -= new CollectionItemsChangedEventHandler<Run>(optimizer_Runs_ItemsAdded);
+      optimizer.Runs.ItemsRemoved -= new CollectionItemsChangedEventHandler<Run>(optimizer_Runs_ItemsRemoved);
     }
     private void optimizer_ExceptionOccurred(object sender, EventArgs<Exception> e) {
@@ -275 +291 @@
       }
     }
+    private void optimizer_Runs_CollectionReset(object sender, CollectionItemsChangedEventArgs<Run> e) {
+      Runs.RemoveRange(e.OldItems);
+      Runs.AddRange(e.Items);
+    }
+    private void optimizer_Runs_ItemsAdded(object sender, CollectionItemsChangedEventArgs<Run> e) {
+      Runs.AddRange(e.Items);
+    }
+    private void optimizer_Runs_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<Run> e) {
+      Runs.RemoveRange(e.Items);
+    }
     #endregion
   }

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

@@ -26 +26 @@
   /// Interface to represent optimizers such as algorithms, batch runs, or experiments.
   /// </summary>
-  public interface IOptimizer : IExecutable {
-    void Prepare(bool clearResults);
+  public interface IOptimizer : INamedItem, IExecutable {
+    RunCollection Runs { get; }
+
+    void Prepare(bool clearRuns);
   }
 }

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

@@ -59 +59 @@
       results = new Dictionary<string, IItem>();
     }
-    public Run(string name, IAlgorithm algorithm)
-      : base(name) {
-      parameters = new Dictionary<string, IItem>();
-      results = new Dictionary<string, IItem>();
-      algorithm.CollectParameterValues(parameters);
-      algorithm.CollectResultValues(results);
-    }
     public Run(string name, string description)
       : base(name, description) {
       parameters = new Dictionary<string, IItem>();
       results = new Dictionary<string, IItem>();
-    }
-    public Run(string name, string description, IAlgorithm algorithm)
-      : base(name, description) {
-      parameters = new Dictionary<string, IItem>();
-      results = new Dictionary<string, IItem>();
-      algorithm.CollectParameterValues(parameters);
-      algorithm.CollectResultValues(results);
     }