Changeset 3260

Timestamp:

04/03/10 06:04:49 (15 years ago)

Author:

swagner

Message:

Continued work on algorithm batch processing (#947).

Location:

trunk/sources

Files:

• HeuristicLab.Core.Views/3.3/EngineView.cs (modified) (2 diffs)
• HeuristicLab.Core/3.3/Interfaces/IParameterizedItem.cs (modified) (2 diffs)
• HeuristicLab.Core/3.3/ParameterizedNamedItem.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/BatchRunView.Designer.cs (modified) (7 diffs)
• HeuristicLab.Optimization.Views/3.3/BatchRunView.cs (modified) (2 diffs)
• HeuristicLab.Optimization.Views/3.3/HeuristicLab.Optimization.Views-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.Designer.cs (added)
• HeuristicLab.Optimization.Views/3.3/RunCollectionView.cs (added)
• HeuristicLab.Optimization.Views/3.3/RunView.Designer.cs (added)
• HeuristicLab.Optimization.Views/3.3/RunView.cs (added)
• HeuristicLab.Optimization/3.3/Algorithm.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/BatchRun.cs (modified) (9 diffs)
• HeuristicLab.Optimization/3.3/EngineAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (1 diff)
• HeuristicLab.Optimization/3.3/Interfaces/IAlgorithm.cs (modified) (2 diffs)
• HeuristicLab.Optimization/3.3/Run.cs (added)
• HeuristicLab.Optimization/3.3/RunCollection.cs (added)

trunk/sources/HeuristicLab.Core.Views/3.3/EngineView.cs

@@ -103 +103 @@
       else {
         UpdateExecutionTimeTextBox();
-        logTextBox.Clear();
         Log("Engine prepared");
       }
@@ -127 +126 @@
     protected virtual void Content_ExecutionTimeChanged(object sender, EventArgs e) {
       executionTimeCounter++;
-      if ((executionTimeCounter == 100) || !Content.Running) {
+      if ((executionTimeCounter >= 100) || !Content.Running) {
         executionTimeCounter = 0;
         UpdateExecutionTimeTextBox();

trunk/sources/HeuristicLab.Core/3.3/Interfaces/IParameterizedItem.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.Collections;
 
@@ -28 +29 @@
   public interface IParameterizedItem : IItem {
     IObservableKeyedCollection<string, IParameter> Parameters { get; }
+
+    void CollectParameterValues(IDictionary<string, IItem> values);
   }
 }

trunk/sources/HeuristicLab.Core/3.3/ParameterizedNamedItem.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Collections;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -82 +84 @@
       return clone;
     }
+
+    public virtual void CollectParameterValues(IDictionary<string, IItem> values) {
+      foreach (IValueParameter param in parameters.OfType<IValueParameter>()) {
+        values.Add(param.Name, param.Value != null ? (IItem)param.Value.Clone() : null);
+        if (param.Value is IParameterizedItem) {
+          Dictionary<string, IItem> children = new Dictionary<string, IItem>();
+          ((IParameterizedItem)param.Value).CollectParameterValues(children);
+          foreach (string key in children.Keys)
+            values.Add(param.Name + "." + key, children[key]);
+        }
+      }
+    }
   }
 }

trunk/sources/HeuristicLab.Optimization.Views/3.3/AlgorithmView.cs

@@ -174 +174 @@
     protected virtual void Content_ExecutionTimeChanged(object sender, EventArgs e) {
       executionTimeCounter++;
-      if ((executionTimeCounter == 100) || !Content.Running) {
+      if ((executionTimeCounter >= 100) || !Content.Running) {
         executionTimeCounter = 0;
         UpdateExecutionTimeTextBox();

trunk/sources/HeuristicLab.Optimization.Views/3.3/BatchRunView.Designer.cs

@@ -52 +52 @@
       this.newAlgorithmButton = new System.Windows.Forms.Button();
       this.algorithmViewHost = new HeuristicLab.Core.Views.ViewHost();
-      this.resultsTabPage = new System.Windows.Forms.TabPage();
+      this.runsTabPage = new System.Windows.Forms.TabPage();
       this.startButton = new System.Windows.Forms.Button();
       this.stopButton = new System.Windows.Forms.Button();
@@ -62 +62 @@
       this.repetitionsLabel = new System.Windows.Forms.Label();
       this.repetitionsNumericUpDown = new System.Windows.Forms.NumericUpDown();
-      this.resultsView = new HeuristicLab.Optimization.Views.ResultCollectionView();
+      this.runsView = new HeuristicLab.Optimization.Views.RunCollectionView();
       ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
       this.tabControl.SuspendLayout();
       this.algorithmTabPage.SuspendLayout();
-      this.resultsTabPage.SuspendLayout();
+      this.runsTabPage.SuspendLayout();
       ((System.ComponentModel.ISupportInitialize)(this.repetitionsNumericUpDown)).BeginInit();
       this.SuspendLayout();
@@ -86 +86 @@
                   | System.Windows.Forms.AnchorStyles.Right)));
       this.tabControl.Controls.Add(this.algorithmTabPage);
-      this.tabControl.Controls.Add(this.resultsTabPage);
+      this.tabControl.Controls.Add(this.runsTabPage);
       this.tabControl.Location = new System.Drawing.Point(0, 78);
       this.tabControl.Name = "tabControl";
@@ -152 +152 @@
       this.algorithmViewHost.ViewType = null;
       // 
-      // resultsTabPage
-      // 
-      this.resultsTabPage.Controls.Add(this.resultsView);
-      this.resultsTabPage.Location = new System.Drawing.Point(4, 22);
-      this.resultsTabPage.Name = "resultsTabPage";
-      this.resultsTabPage.Padding = new System.Windows.Forms.Padding(3);
-      this.resultsTabPage.Size = new System.Drawing.Size(671, 348);
-      this.resultsTabPage.TabIndex = 2;
-      this.resultsTabPage.Text = "Results";
-      this.resultsTabPage.UseVisualStyleBackColor = true;
+      // runsTabPage
+      // 
+      this.runsTabPage.Controls.Add(this.runsView);
+      this.runsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.runsTabPage.Name = "runsTabPage";
+      this.runsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.runsTabPage.Size = new System.Drawing.Size(671, 348);
+      this.runsTabPage.TabIndex = 2;
+      this.runsTabPage.Text = "Runs";
+      this.runsTabPage.UseVisualStyleBackColor = true;
       // 
       // startButton
@@ -268 +268 @@
       this.repetitionsNumericUpDown.ValueChanged += new System.EventHandler(this.repetitionsNumericUpDown_ValueChanged);
       // 
-      // resultsView
-      // 
-      this.resultsView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+      // runsView
+      // 
+      this.runsView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
                   | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.resultsView.Caption = "ResultCollection";
-      this.resultsView.Content = null;
-      this.resultsView.Location = new System.Drawing.Point(6, 6);
-      this.resultsView.Name = "resultsView";
-      this.resultsView.Size = new System.Drawing.Size(659, 336);
-      this.resultsView.TabIndex = 0;
+      this.runsView.Caption = "RunCollection";
+      this.runsView.Content = null;
+      this.runsView.Location = new System.Drawing.Point(6, 6);
+      this.runsView.Name = "runsView";
+      this.runsView.Size = new System.Drawing.Size(659, 336);
+      this.runsView.TabIndex = 0;
       // 
       // BatchRunView
@@ -309 +309 @@
       this.tabControl.ResumeLayout(false);
       this.algorithmTabPage.ResumeLayout(false);
-      this.resultsTabPage.ResumeLayout(false);
+      this.runsTabPage.ResumeLayout(false);
       ((System.ComponentModel.ISupportInitialize)(this.repetitionsNumericUpDown)).EndInit();
       this.ResumeLayout(false);
@@ -331 +331 @@
     private System.Windows.Forms.OpenFileDialog openFileDialog;
     private System.Windows.Forms.SaveFileDialog saveFileDialog;
-    private System.Windows.Forms.TabPage resultsTabPage;
+    private System.Windows.Forms.TabPage runsTabPage;
     private System.Windows.Forms.Label repetitionsLabel;
     private System.Windows.Forms.NumericUpDown repetitionsNumericUpDown;
-    private ResultCollectionView resultsView;
+    private RunCollectionView runsView;
 
   }

trunk/sources/HeuristicLab.Optimization.Views/3.3/BatchRunView.cs

@@ -85 +85 @@
         repetitionsNumericUpDown.Enabled = false;
         algorithmViewHost.Content = null;
-        resultsView.Content = null;
+        runsView.Content = null;
         tabControl.Enabled = false;
         startButton.Enabled = resetButton.Enabled = false;
@@ -96 +96 @@
         algorithmViewHost.ViewType = null;
         algorithmViewHost.Content = Content.Algorithm;
-        resultsView.Content = Content.Results;
+        runsView.Content = Content.Runs;
         tabControl.Enabled = true;
         startButton.Enabled = !Content.Finished;

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

@@ -98 +98 @@
       <DependentUpon>BatchRunView.cs</DependentUpon>
     </Compile>
+    <Compile Include="RunCollectionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RunCollectionView.Designer.cs">
+      <DependentUpon>RunCollectionView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="RunView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RunView.Designer.cs">
+      <DependentUpon>RunView.cs</DependentUpon>
+    </Compile>
     <Compile Include="UserDefinedAlgorithmView.cs">
       <SubType>UserControl</SubType>

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;