Changeset 12267

Timestamp:

03/30/15 13:26:22 (9 years ago)

Author:

pfleck

Message:

#2366 Use EnumValues in the parameter variations for the creation of the experiments.

File:

• branches/EnumValue in CreateExperiment/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs (modified) (1 diff)

branches/EnumValue in CreateExperiment/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

@@ -877 +877 @@
         if (multipleChoiceParameters.Any()) {
           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();
-            while (variantEnumerator.MoveNext() && originalEnumerator.MoveNext()) {
-              if (m.Value == (IItem)originalEnumerator.Current) {
-                variantParam.Value = (dynamic)variantEnumerator.Current;
-                if (m.Value is INamedItem)
-                  variant.Name += m.Key.Name + "=" + ((INamedItem)m.Value).Name + ", ";
-                else variant.Name += m.Key.Name + "=" + m.Value.ToString() + ", ";
-                break;
+            if (m.Key.Value != null && m.Key.Value.GetType().IsGenericType
+                && typeof(EnumValue<>).IsAssignableFrom(m.Key.Value.GetType().GetGenericTypeDefinition())) {
+              var valueParam = (IValueParameter)variant.Parameters[m.Key.Name];
+              valueParam.Value = m.Value;
+              variant.Name += m.Key.Name + "=" + m.Value + ", ";
+            } else {
+              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();
+              while (variantEnumerator.MoveNext() && originalEnumerator.MoveNext()) {
+                if (m.Value == (IItem)originalEnumerator.Current) {
+                  variantParam.Value = (dynamic)variantEnumerator.Current;
+                  if (m.Value is INamedItem)
+                    variant.Name += m.Key.Name + "=" + ((INamedItem)m.Value).Name + ", ";
+                  else variant.Name += m.Key.Name + "=" + m.Value.ToString() + ", ";
+                  break;
+                }
               }
             }