Changeset 5654 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views

Timestamp:

03/10/11 11:20:28 (13 years ago)

Author:

cneumuel

Message:

#1215

• made MetaOptimizationProblem storable
• fixed remove item exception in ValueConfigurationCheckedItemCollectionView
• added possibility to select engine in CreateExperimentDialog

Location:

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3

Files:

• CreateExperimentDialog.Designer.cs (modified) (6 diffs)
• CreateExperimentDialog.cs (modified) (2 diffs)
• CreateExperimentDialog.resx (modified) (1 diff)
• HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj (modified) (1 diff)
• MetaOptimizationProblemView.cs (modified) (4 diffs)
• ValueConfigurationViews/ValueConfigurationCheckedItemCollectionView.Designer.cs (added)
• ValueConfigurationViews/ValueConfigurationCheckedItemCollectionView.cs (added)
• ValueConfigurationViews/ValueConfigurationCheckedItemList.Designer.cs (deleted)
• ValueConfigurationViews/ValueConfigurationCheckedItemList.cs (deleted)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/CreateExperimentDialog.Designer.cs

@@ -53 +53 @@
       this.repetitionsNumericUpDown = new System.Windows.Forms.NumericUpDown();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+      this.label1 = new System.Windows.Forms.Label();
+      this.engineComboBox = new System.Windows.Forms.ComboBox();
       ((System.ComponentModel.ISupportInitialize)(this.repetitionsNumericUpDown)).BeginInit();
       this.SuspendLayout();
@@ -60 +62 @@
       this.okButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
-      this.okButton.Location = new System.Drawing.Point(113, 58);
+      this.okButton.Location = new System.Drawing.Point(113, 83);
       this.okButton.Name = "okButton";
       this.okButton.Size = new System.Drawing.Size(75, 23);
@@ -72 +74 @@
       this.cancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
       this.cancelButton.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-      this.cancelButton.Location = new System.Drawing.Point(194, 58);
+      this.cancelButton.Location = new System.Drawing.Point(194, 83);
       this.cancelButton.Name = "cancelButton";
       this.cancelButton.Size = new System.Drawing.Size(75, 23);
@@ -137 +139 @@
       this.repetitionsNumericUpDown.Validated += new System.EventHandler(this.repetitionsNumericUpDown_Validated);
       // 
+      // label1
+      // 
+      this.label1.AutoSize = true;
+      this.label1.Location = new System.Drawing.Point(12, 57);
+      this.label1.Name = "label1";
+      this.label1.Size = new System.Drawing.Size(43, 13);
+      this.label1.TabIndex = 6;
+      this.label1.Text = "&Engine:";
+      // 
+      // engineComboBox
+      // 
+      this.engineComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+                  | System.Windows.Forms.AnchorStyles.Right)));
+      this.engineComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.engineComboBox.FormattingEnabled = true;
+      this.engineComboBox.Location = new System.Drawing.Point(113, 54);
+      this.engineComboBox.Name = "engineComboBox";
+      this.engineComboBox.Size = new System.Drawing.Size(156, 21);
+      this.engineComboBox.TabIndex = 7;
+      // 
       // CreateExperimentDialog
       // 
@@ -143 +165 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.CancelButton = this.cancelButton;
-      this.ClientSize = new System.Drawing.Size(281, 93);
+      this.ClientSize = new System.Drawing.Size(281, 118);
+      this.Controls.Add(this.engineComboBox);
+      this.Controls.Add(this.label1);
       this.Controls.Add(this.repetitionsNumericUpDown);
       this.Controls.Add(this.repetitionsLabel);
@@ -172 +196 @@
     private System.Windows.Forms.NumericUpDown repetitionsNumericUpDown;
     private System.Windows.Forms.ToolTip toolTip;
+    private System.Windows.Forms.Label label1;
+    private System.Windows.Forms.ComboBox engineComboBox;
 
   }

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/CreateExperimentDialog.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Windows.Forms;
-using HeuristicLab.Optimization;
+using HeuristicLab.Core;
 
 namespace HeuristicLab.Problems.MetaOptimization.Views {
@@ -33 +34 @@
       get { return (int)repetitionsNumericUpDown.Value; }
     }
+    public IEngine Engine {
+      get { return (IEngine)engineComboBox.SelectedItem; }
+    }
 
-    public CreateExperimentDialog() {
+    public CreateExperimentDialog(IEnumerable<IEngine> engines, Type selectedEngine) {
       InitializeComponent();
+      foreach (var engine in engines) {
+        this.engineComboBox.Items.Add(engine);
+        if (engine.GetType() == selectedEngine) {
+          this.engineComboBox.SelectedItem = engine;
+        }
+        if (this.engineComboBox.SelectedItem == null) {
+          this.engineComboBox.SelectedIndex = 0;
+        }
+      }
     }
 

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/CreateExperimentDialog.resx

@@ -121 +121 @@
     <value>17, 17</value>
   </metadata>
+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj

@@ -114 +114 @@
       <HintPath>..\..\..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.SequentialEngine-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.SequentialEngine-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/MetaOptimizationProblemView.cs

@@ -1 +1 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
 using System.Linq;
-using System.Text;
+using System.Windows.Forms;
+using HeuristicLab.Core;
 using HeuristicLab.MainForm;
+using HeuristicLab.Optimization;
 using HeuristicLab.Optimization.Views;
-using HeuristicLab.Optimization;
-using System.Windows.Forms;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.MetaOptimization.Views {
@@ -68 +65 @@
         }
         if (result == System.Windows.Forms.DialogResult.OK) {
-          CreateExperimentDialog dlg = new CreateExperimentDialog();
+          CreateExperimentDialog dlg = new CreateExperimentDialog(ApplicationManager.Manager.GetInstances<IEngine>(), typeof(SequentialEngine.SequentialEngine));
           DialogResult dlgResult = dlg.ShowDialog();
 
           if (dlgResult == DialogResult.OK) {
-            IAlgorithm algorithm = Content.Algorithm;
+            var algorithm = (EngineAlgorithm)Content.Algorithm.Clone();
             if(Content.Problems.Count > 0) algorithm.Problem = Content.Problems.First();
+            algorithm.Engine = (IEngine)dlg.Engine.Clone();
             Experiment experiment;
 
@@ -89 +87 @@
     #endregion
 
-    protected void parameterCollectionView_DragEnterOver(object sender, System.Windows.Forms.DragEventArgs e) {
+    private void parameterCollectionView_DragEnterOver(object sender, System.Windows.Forms.DragEventArgs e) {
       e.Effect = DragDropEffects.None;
       Type type = e.Data.GetData("Type") as Type;
@@ -99 +97 @@
       }
     }
-    protected void parameterCollectionView_DragDrop(object sender, System.Windows.Forms.DragEventArgs e) {
+    private void parameterCollectionView_DragDrop(object sender, System.Windows.Forms.DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
         IAlgorithm algorithm = e.Data.GetData("Value") as IAlgorithm;