Changeset 8013 for trunk/sources

Timestamp:

06/15/12 22:44:01 (12 years ago)

Author:

abeham

Message:

#1851: Enabled to set Value to null for OptionalConstrainedValueParameters

File:

• trunk/sources/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

@@ -60 +60 @@
     private HashSet<IValueParameter> boolParameters;
     private Dictionary<IValueParameter, HashSet<IItem>> multipleChoiceParameters;
+    private IItem optionalNullChoice = new BoolValue(); // any item will do
 
     private StringBuilder failedInstances;
@@ -161 +162 @@
       ClearDetailsView();
 
+      var isOptionalConstrainedValueParameter = typeof(OptionalConstrainedValueParameter<>).IsAssignableFrom(parameter.GetType().GetGenericTypeDefinition());
       var isConstrainedValueParameter =
-        typeof(OptionalConstrainedValueParameter<>).IsAssignableFrom(parameter.GetType().GetGenericTypeDefinition())
+        isOptionalConstrainedValueParameter
         || typeof(ConstrainedValueParameter<>).Equals(parameter.GetType().GetGenericTypeDefinition());
 
@@ -169 +171 @@
         choicesListView.Tag = parameter;
 
+        if (isOptionalConstrainedValueParameter) {
+          choicesListView.Items.Add(new ListViewItem("-") {
+            Tag = optionalNullChoice,
+            Checked = multipleChoiceParameters.ContainsKey(parameter)
+            && multipleChoiceParameters[parameter].Contains(optionalNullChoice)
+          });
+        }
         dynamic constrainedValuedParameter = parameter;
         dynamic validValues = constrainedValuedParameter.ValidValues;
@@ -797 +806 @@
           foreach (var m in mcEnumerator.Current) {
             dynamic variantParam = variant.Parameters[m.Key.Name];
+            if (m.Value == optionalNullChoice) {
+              variantParam.Value = null;
+              variant.Name += m.Key.Name + "=null, ";
+              continue;
+            }
             var variantEnumerator = ((IEnumerable<object>)variantParam.ValidValues).GetEnumerator();
             var originalEnumerator = ((IEnumerable<object>)((dynamic)m.Key).ValidValues).GetEnumerator();