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

Timestamp:

01/20/11 01:30:44 (13 years ago)

Author:

cneumuel

Message:

#1215

• made all IAlgorithm types compatible to be loaded into MetaOptimization.
• valid problem types are now automatically set

Location:

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

Files:

• MetaOptimizationProblemView.cs (modified) (3 diffs)
• ObjectSelectorDialog.Designer.cs (modified) (4 diffs)
• ObjectSelectorDialog.resx (modified) (1 diff)

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

@@ -72 +72 @@
 
           if (dlgResult == DialogResult.OK) {
-            EngineAlgorithm algorithm = Content.Algorithm;
+            IAlgorithm algorithm = Content.Algorithm;
             if(Content.Problems.Count > 0) algorithm.Problem = Content.Problems.First();
             Experiment experiment;
@@ -93 +93 @@
       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())) {
+        IAlgorithm algorithm = e.Data.GetData("Value") as IAlgorithm;
+        if (algorithm != null && algorithm.Problem == null || Content.ProblemType.ValidTypes.Contains(algorithm.Problem.GetType())) {
           e.Effect = DragDropEffects.Copy;
         }
@@ -101 +101 @@
     protected void parameterCollectionView_DragDrop(object sender, System.Windows.Forms.DragEventArgs e) {
       if (e.Effect != DragDropEffects.None) {
-        EngineAlgorithm algorithm = e.Data.GetData("Value") as EngineAlgorithm;
+        IAlgorithm algorithm = e.Data.GetData("Value") as IAlgorithm;
         Content.ImportAlgorithm(algorithm);
       }

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

@@ -46 +46 @@
       this.itemsListView.MultiSelect = false;
       this.itemsListView.Name = "itemsListView";
-      this.itemsListView.Size = new System.Drawing.Size(387, 501);
+      this.itemsListView.Size = new System.Drawing.Size(653, 360);
       this.itemsListView.TabIndex = 2;
       this.itemsListView.UseCompatibleStateImageBehavior = false;
@@ -72 +72 @@
       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(324, 519);
+      this.cancelButton.Location = new System.Drawing.Point(590, 378);
       this.cancelButton.Name = "cancelButton";
       this.cancelButton.Size = new System.Drawing.Size(75, 23);
@@ -84 +84 @@
       this.okButton.DialogResult = System.Windows.Forms.DialogResult.OK;
       this.okButton.Enabled = false;
-      this.okButton.Location = new System.Drawing.Point(243, 519);
+      this.okButton.Location = new System.Drawing.Point(509, 378);
       this.okButton.Name = "okButton";
       this.okButton.Size = new System.Drawing.Size(75, 23);
@@ -98 +98 @@
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.CancelButton = this.cancelButton;
-      this.ClientSize = new System.Drawing.Size(411, 554);
+      this.ClientSize = new System.Drawing.Size(677, 413);
       this.Controls.Add(this.cancelButton);
       this.Controls.Add(this.okButton);

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/ObjectSelectorDialog.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>
 </root>