Changeset 5313 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3

Timestamp:

01/17/11 19:17:51 (13 years ago)

Author:

cneumuel

Message:

#1215

• changed AlgorithType and ProblemType to actually be types not objects. this eliminates redundant views for MetaOptimizationProblem
• import algorithm for MetaOptimizationProblem
• nicer dialog for combination creation
• fixed iconimage for ParameterConfigurations
• fixed ValidValues

Location:

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

Files:

• ConstrainedTypeValueView.Designer.cs (added)
• ConstrainedTypeValueView.cs (added)
• ConstrainedTypeValueView.resx (added)
• CreateExperimentDialog.Designer.cs (added)
• CreateExperimentDialog.cs (added)
• CreateExperimentDialog.resx (added)
• HeuristicLab.Problems.MetaOptimization.Views-3.3.csproj (modified) (2 diffs)
• MetaOptimizationProblemView.Designer.cs (modified) (2 diffs)
• MetaOptimizationProblemView.cs (modified) (3 diffs)
• MetaOptimizationProblemView.resx (modified) (1 diff)

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

@@ -132 +132 @@
       <DependentUpon>ConstrainedItemListView.cs</DependentUpon>
     </Compile>
+    <Compile Include="ConstrainedTypeValueView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ConstrainedTypeValueView.Designer.cs">
+      <DependentUpon>ConstrainedTypeValueView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="CreateExperimentDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="CreateExperimentDialog.Designer.cs">
+      <DependentUpon>CreateExperimentDialog.cs</DependentUpon>
+    </Compile>
     <Compile Include="ItemDictionaryView.cs">
       <SubType>UserControl</SubType>
@@ -201 +213 @@
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="ConstrainedTypeValueView.resx">
+      <DependentUpon>ConstrainedTypeValueView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="CreateExperimentDialog.resx">
+      <DependentUpon>CreateExperimentDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="ItemDictionaryView.resx">
       <DependentUpon>ItemDictionaryView.cs</DependentUpon>

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

@@ -30 +30 @@
       // parameterCollectionView
       // 
+      this.parameterCollectionView.AllowDrop = true;
       this.parameterCollectionView.Size = new System.Drawing.Size(604, 353);
+      this.parameterCollectionView.DragDrop += new System.Windows.Forms.DragEventHandler(this.parameterCollectionView_DragDrop);
+      this.parameterCollectionView.DragEnter += new System.Windows.Forms.DragEventHandler(this.parameterCollectionView_DragEnterOver);
+      this.parameterCollectionView.DragOver += new System.Windows.Forms.DragEventHandler(this.parameterCollectionView_DragEnterOver);
       // 
       // nameTextBox
@@ -46 +50 @@
       this.createExperimentButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
                   | System.Windows.Forms.AnchorStyles.Right)));
-      this.createExperimentButton.Location = new System.Drawing.Point(0, 405);
+      this.createExperimentButton.Location = new System.Drawing.Point(0, 411);
       this.createExperimentButton.Name = "createExperimentButton";
-      this.createExperimentButton.Size = new System.Drawing.Size(604, 31);
+      this.createExperimentButton.Size = new System.Drawing.Size(604, 24);
       this.createExperimentButton.TabIndex = 5;
-      this.createExperimentButton.Text = "Create Experiment";
+      this.createExperimentButton.Text = "Create Combinations";
       this.createExperimentButton.UseVisualStyleBackColor = true;
       this.createExperimentButton.Click += new System.EventHandler(this.createExperimentButton_Click);

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

@@ -9 +9 @@
 using HeuristicLab.Optimization.Views;
 using HeuristicLab.Optimization;
+using System.Windows.Forms;
 
 namespace HeuristicLab.Problems.MetaOptimization.Views {
@@ -62 +63 @@
         }
         if (result == System.Windows.Forms.DialogResult.OK) {
-          Experiment experiment;
-          if (Content.Repetitions.Value > 1) {
-            experiment = Content.ParameterConfigurationTree.GenerateExperiment(Content.Algorithm, true, Content.Repetitions.Value);
-          } else {
-            experiment = Content.ParameterConfigurationTree.GenerateExperiment(Content.Algorithm);
+          CreateExperimentDialog dlg = new CreateExperimentDialog();
+          DialogResult dlgResult = dlg.ShowDialog();
+
+          if (dlgResult == DialogResult.OK) {
+            EngineAlgorithm algorithm = Content.Algorithm;
+            if(Content.Problems.Count > 0) algorithm.Problem = Content.Problems.First();
+            Experiment experiment;
+
+            if (dlg.CreateBatchRuns) {
+              experiment = Content.ParameterConfigurationTree.GenerateExperiment(algorithm, true, dlg.Repetitions);
+            } else {
+              experiment = Content.ParameterConfigurationTree.GenerateExperiment(algorithm);
+            }
+            MainFormManager.MainForm.ShowContent(experiment);
           }
-          MainFormManager.MainForm.ShowContent(experiment);
         }
       }
@@ -74 +83 @@
 
     #endregion
+
+    protected void parameterCollectionView_DragEnterOver(object sender, System.Windows.Forms.DragEventArgs e) {
+      e.Effect = DragDropEffects.None;
+      Type type = e.Data.GetData("Type") as Type;
+      if ((type != null) && (Content.AlgorithmType.ValidTypes.Contains(type))) {
+        EngineAlgorithm algorithm = e.Data.GetData("Value") as EngineAlgorithm;
+        if (algorithm.Problem == null || Content.ProblemType.ValidTypes.Contains(algorithm.Problem.GetType())) {
+          e.Effect = DragDropEffects.Copy;
+        }
+      }
+    }
+    protected void parameterCollectionView_DragDrop(object sender, System.Windows.Forms.DragEventArgs e) {
+      if (e.Effect != DragDropEffects.None) {
+        EngineAlgorithm algorithm = e.Data.GetData("Value") as EngineAlgorithm;
+        Content.ImportAlgorithm(algorithm);
+      }
+    }
   }
 }

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

@@ -113 +113 @@
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>107, 17</value>
   </metadata>
-  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="errorProvider.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>107, 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>