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

Timestamp:

01/17/11 19:17:51 (14 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

File:

• branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/MetaOptimizationProblemView.cs (modified) (3 diffs)

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);
+      }
+    }
   }
 }