Changeset 12689 for branches/HiveStatistics/sources/HeuristicLab.Optimizer

Timestamp:

07/08/15 15:32:12 (9 years ago)

Author:

dglaser

Message:

#2388: Merged trunk into HiveStatistics branch

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Optimizer (modified) (1 prop)
• HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs (modified) (6 diffs)
• HeuristicLab.Optimizer/3.3/NewItemDialog.cs (modified) (9 diffs)

branches/HiveStatistics/sources/HeuristicLab.Optimizer/3.3/CreateExperimentDialog.cs

@@ -169 +169 @@
           else boolParameters.Remove(parameter);
         }
+
+        bool isEnumValue = parameter.Value != null && parameter.Value.GetType().IsGenericType
+                           && typeof(EnumValue<>).IsAssignableFrom(parameter.Value.GetType().GetGenericTypeDefinition());
+        if (isEnumValue) {
+          if (e.Item.Checked) multipleChoiceParameters.Add(parameter, new HashSet<IItem>(new EnumValueEqualityComparer()));
+          else multipleChoiceParameters.Remove(parameter);
+        }
       }
 
@@ -192 +199 @@
         isOptionalConstrainedValueParameter
         || typeof(ConstrainedValueParameter<>).Equals(parameter.GetType().GetGenericTypeDefinition());
-
-      if (isConstrainedValueParameter) {
+      bool isEnumValue = parameter.Value != null && parameter.Value.GetType().IsGenericType
+                         && typeof(EnumValue<>).IsAssignableFrom(parameter.Value.GetType().GetGenericTypeDefinition());
+
+      if (isConstrainedValueParameter || isEnumValue) {
         detailsTypeLabel.Text = "Choices:";
         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;
-        foreach (var choice in validValues) {
-          choicesListView.Items.Add(new ListViewItem(choice.ToString()) {
-            Tag = choice,
-            Checked = multipleChoiceParameters.ContainsKey(parameter)
-            && multipleChoiceParameters[parameter].Contains(choice)
-          });
+        if (isConstrainedValueParameter) {
+          if (isOptionalConstrainedValueParameter) {
+            choicesListView.Items.Add(new ListViewItem("-") {
+              Tag = optionalNullChoice,
+              Checked = multipleChoiceParameters.ContainsKey(parameter)
+                        && multipleChoiceParameters[parameter].Contains(optionalNullChoice)
+            });
+          }
+          dynamic constrainedValuedParameter = parameter;
+          dynamic validValues = constrainedValuedParameter.ValidValues;
+          foreach (var choice in validValues) {
+            choicesListView.Items.Add(new ListViewItem(choice.ToString()) {
+              Tag = choice,
+              Checked = multipleChoiceParameters.ContainsKey(parameter)
+                        && multipleChoiceParameters[parameter].Contains(choice)
+            });
+          }
+        }
+        if (isEnumValue) {
+          var enumType = parameter.Value.GetType().GetGenericArguments()[0];
+          var enumValueType = typeof(EnumValue<>).MakeGenericType(enumType);
+          foreach (var enumChoice in Enum.GetValues(enumType)) {
+            choicesListView.Items.Add(new ListViewItem(enumChoice.ToString()) {
+              Tag = Activator.CreateInstance(enumValueType, enumChoice),
+              Checked = multipleChoiceParameters.ContainsKey(parameter)
+                        && multipleChoiceParameters[parameter].Any((dynamic item) => item.Value.Equals(enumChoice))
+            });
+          }
         }
         choicesListView.Enabled = multipleChoiceParameters.ContainsKey(parameter);
@@ -455 +477 @@
           if (valueParam != null && (valueParam.Value is ValueTypeValue<bool>
               || valueParam.Value is ValueTypeValue<int>
-              || valueParam.Value is ValueTypeValue<double>)
+              || valueParam.Value is ValueTypeValue<double>
+              || (valueParam.Value != null && valueParam.Value.GetType().IsGenericType
+                    && typeof(EnumValue<>).IsAssignableFrom(valueParam.Value.GetType().GetGenericTypeDefinition())))
             || typeof(OptionalConstrainedValueParameter<>).IsAssignableFrom(param.GetType().GetGenericTypeDefinition())
             || typeof(ConstrainedValueParameter<>).IsAssignableFrom(param.GetType().GetGenericTypeDefinition()))
@@ -603 +627 @@
       bool finished;
       do {
+        foreach (var p in boolParameters) {
+          if (!configuration.ContainsKey(p))
+            configuration.Add(p, false);
+        }
+
+        yield return configuration;
         finished = true;
+
         foreach (var p in boolParameters) {
-          if (!configuration.ContainsKey(p)) configuration.Add(p, false);
-          else {
-            if (configuration[p]) {
-              configuration[p] = false;
-            } else {
-              configuration[p] = true;
-              finished = false;
-              break;
-            }
-          }
-        }
-        yield return configuration;
+          if (configuration[p]) {
+            configuration[p] = false;
+          } else {
+            configuration[p] = true;
+            finished = false;
+            break;
+          }
+        }
       } while (!finished);
     }
@@ -650 +677 @@
     }
     #endregion
+
+    #region EnumValueEqualityComparer
+    private class EnumValueEqualityComparer : EqualityComparer<IItem> {
+      public override bool Equals(IItem x, IItem y) {
+        if (typeof(EnumValue<>).IsAssignableFrom(x.GetType().GetGenericTypeDefinition()) &&
+            typeof(EnumValue<>).IsAssignableFrom(y.GetType().GetGenericTypeDefinition())) {
+          dynamic enumValueX = x;
+          dynamic enumValueY = y;
+          return enumValueX.Value.Equals(enumValueY.Value);
+        } else return object.ReferenceEquals(x, y);
+      }
+
+      public override int GetHashCode(IItem obj) {
+        if (typeof(EnumValue<>).IsAssignableFrom(obj.GetType().GetGenericTypeDefinition())) {
+          dynamic enumValue = obj;
+          return enumValue.Value.GetHashCode();
+        } else return obj.GetHashCode();
+      }
+    }
+    #endregion
+
     #endregion
 
@@ -832 +880 @@
         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;
+                }
               }
             }

branches/HiveStatistics/sources/HeuristicLab.Optimizer/3.3/NewItemDialog.cs

@@ -27 +27 @@
 using System.Windows.Forms;
 using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.PluginInfrastructure;
@@ -93 +94 @@
 
     private TreeNode CreateCategoryTree(IEnumerable<IGrouping<string, Type>> categories) {
-      imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.Class);      // default icon
-      imageList.Images.Add(HeuristicLab.Common.Resources.VSImageLibrary.Namespace);  // plugins
+      imageList.Images.Add(VSImageLibrary.Class);      // default icon
+      imageList.Images.Add(VSImageLibrary.Namespace);  // plugins
 
       var rootNode = new TreeNode();
@@ -109 +110 @@
 
         // Skip categories with same full name because the raw name can still be different (missing order)
-        if (rootNode.Nodes.Find(fullName, searchAllChildren: true).Length > 0)
+        if (rootNode.Nodes.Find(fullName, true).Length > 0)
           continue;
 
-        var categoryNode = new TreeNode(name, imageIndex: 1, selectedImageIndex: 1) {
+        var categoryNode = new TreeNode(name, 1, 1) {
           Name = fullName,
           Tag = rawName
@@ -133 +134 @@
         rawName = rawName == null ? rawParentName : rawName + CreatableAttribute.Categories.SplitToken + rawParentName;
         var fullName = CreatableAttribute.Categories.GetFullName(rawName);
-        parentNode = node.Nodes.Find(fullName, searchAllChildren: false).SingleOrDefault();
+        parentNode = node.Nodes.Find(fullName, false).SingleOrDefault();
         if (parentNode == null) {
           var name = CreatableAttribute.Categories.GetName(rawName);
-          parentNode = new TreeNode(name, imageIndex: 1, selectedImageIndex: 1) {
+          parentNode = new TreeNode(name, 1, 1) {
             Name = fullName,
             Tag = rawName
@@ -149 +150 @@
       foreach (var category in categories) {
         var fullName = CreatableAttribute.Categories.GetFullName(category.Key);
-        var categoryNode = node.Nodes.Find(fullName, searchAllChildren: true).Single();
+        var categoryNode = node.Nodes.Find(fullName, true).Single();
         foreach (var creatable in category) {
           var itemNode = CreateItemNode(creatable);
@@ -323 +324 @@
     private void RestoreSelectedNode(TreeNode selectedNode) {
       if (selectedNode != null) {
-        var node = typesTreeView.Nodes.Find(selectedNode.Name, searchAllChildren: true).SingleOrDefault();
+        var node = typesTreeView.Nodes.Find(selectedNode.Name, true).SingleOrDefault();
         if (node != null)
           typesTreeView.SelectedNode = node;
@@ -360 +361 @@
     }
 
-    private TreeNode toolStripMenuNode = null;
+    private TreeNode toolStripMenuNode;
     private void typesTreeView_MouseDown(object sender, MouseEventArgs e) {
       if (e.Button == MouseButtons.Right) {
@@ -440 +441 @@
       }
     }
-    private TreeNode LastVisibleNode {
-      get {
-        var node = FirstVisibleNode;
-        while (node != null && node.NextVisibleNode != null) node = node.NextVisibleNode;
-        return node;
-      }
-    }
 
     private class ItemTreeNodeComparer : IComparer {
@@ -456 +450 @@
         if (lhs.Tag is string && rhs.Tag is string) {
           return Comparer.Compare((string)lhs.Tag, (string)rhs.Tag);
-        } else if (lhs.Tag is string) {
+        }
+        if (lhs.Tag is string) {
           return -1;
-        } else
-          return 1;
+        }
+        return 1;
       }
     }