Changeset 5231 for branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/ValueConfigurationViews

Timestamp:

01/07/11 17:06:40 (14 years ago)

Author:

cneumuel

Message:

#1215

• fixed issues with wrongly configured operators by cloning the corresponding ValidValue object rather than instantiating a new operator

Location:

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

Files:

• ValueConfigurationCheckedItemList.cs (modified) (1 diff)
• ValueView.cs (modified) (1 diff)

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/ValueConfigurationViews/ValueConfigurationCheckedItemList.cs

@@ -74 +74 @@
         try {
           IItem value = (IItem)objectSelectorDialog.Item.Clone();
-          return new ValueConfiguration(value, value.GetType());
+          if (value is NullValue) {
+            return new NullValueConfiguration();
+          } else {
+            return new ValueConfiguration(value, value.GetType());
+          }
         }
         catch (Exception ex) {

branches/HeuristicLab.MetaOptimization/HeuristicLab.Problems.MetaOptimization.Views/3.3/ValueConfigurationViews/ValueView.cs

@@ -46 +46 @@
 
     private void setValueButton_Click(object sender, EventArgs e) {
-      var typesWithoutNullValue = Content.ValidTypes.Where(x => x != typeof(NullValue));
-      var instances = typesWithoutNullValue.Select(x => (IItem)Activator.CreateInstance(x));
-      var groupedInstances = instances.GroupBy(x => ApplicationManager.Manager.GetDeclaringPlugin(x.GetType()).Name);
+      //var typesWithoutNullValue = Content.ValidTypes.Where(x => x != typeof(NullValue));
+      //var instances = typesWithoutNullValue.Select(x => (IItem)Activator.CreateInstance(x));
+      //var groupedInstances = instances.GroupBy(x => ApplicationManager.Manager.GetDeclaringPlugin(x.GetType()).Name);
+      //var objectSelectorDialog = new ObjectSelectorDialog<IItem>(groupedInstances);
 
-      var objectSelectorDialog = new ObjectSelectorDialog<IItem>(groupedInstances);
+      var withoutNullValue = Content.ValidValues.Where(x => x != null && !(x is NullValue));
+      var objectSelectorDialog = new ObjectSelectorDialog<IItem>(withoutNullValue.GroupBy(x => ApplicationManager.Manager.GetDeclaringPlugin(x.GetType()).Name));
       if (objectSelectorDialog.ShowDialog(this) == DialogResult.OK) {
         try {