Changeset 15032 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Views/ExpressionSelectionView.cs

Timestamp:

06/12/17 14:11:43 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed bias 0 issue, PushExpressionFrequencyAnalyzer, Fixed probability for ERC settings, Fixed enable/disable instructions, Added expression descriptions

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Views/ExpressionSelectionView.cs (modified) (8 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Views/ExpressionSelectionView.cs

@@ -5 +5 @@
 
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Views {
-  using System;
   using System.Collections.Generic;
   using System.Linq;
@@ -11 +10 @@
 
   using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Extensions;
 
   using Stack;
@@ -52 +52 @@
 
       if (e.Node.Parent == null) {
-        Content.SetStack(stackType, e.Node.Checked, true, false);
+        Content.SetStack(stackType, e.Node.Checked);
         SetStackNodeText(e.Node);
         foreach (var subNode in e.Node.Nodes.OfType<TreeNode>().Where(n => n.Checked != e.Node.Checked))
@@ -62 +62 @@
         // enable/disable stack if no or at least one expression is enabled
         if ((e.Node.Checked && !e.Node.Parent.Checked) ||
-            (!e.Node.Checked && !e.Node.Parent.Nodes.OfType<TreeNode>().Any(n => n.Checked))) {
-          Content.SetStack(stackType, e.Node.Checked, false, false);
+            (!e.Node.Checked && e.Node.Parent.Nodes.OfType<TreeNode>().All(n => !n.Checked))) {
           e.Node.Parent.Checked = e.Node.Checked;
         }
@@ -90 +89 @@
       expressionsTreeView.Nodes.Clear();
 
-      var treeNodes = GetTreeNodes(Content.EnabledExpressions).ToArray();
+      var treeNodes = GetTreeNodes(Content.EnabledExpressions)
+        .OrderBy(x => x.Text)
+        .ToArray();
+
       expressionsTreeView.Nodes.AddRange(treeNodes);
     }
 
-    private IEnumerable<TreeNode> GetTreeNodes(IList<string> enabledExpressions) {
+    private IEnumerable<TreeNode> GetTreeNodes(IReadOnlyList<string> enabledExpressions) {
       foreach (var stackType in ExpressionTable.StackTypeToNamesTable.Keys) {
         var stackTreeNode = new TreeNode {
@@ -107 +109 @@
 
         var expressionNodes = stackExpressions
+          .Where(name => {
+            var type = ExpressionTable.NameToTypeTable[name];
+            var attribute = ExpressionTable.TypeToAttributeTable[type];
+
+            return !attribute.IsHidden;
+          })
           .OrderBy(name => name)
           .Select(name => new TreeNode {
@@ -113 +121 @@
             Checked = enabledStackExpressions.Contains(name),
           }).ToArray();
+
+        foreach (var node in expressionNodes) {
+          var type = ExpressionTable.NameToTypeTable[node.Text];
+          var attribute = ExpressionTable.TypeToAttributeTable[type];
+
+          node.ToolTipText = attribute.Description;
+        }
 
         stackTreeNode.Nodes.AddRange(expressionNodes);
@@ -121 +136 @@
 
     private void SetStackNodeText(TreeNode node) {
-      var stackType = (StackTypes)node.Tag;
-      var stackExpressions = ExpressionTable.StackTypeToNamesTable[stackType];
+      var stackTypes = (StackTypes)node.Tag;
+      var stackExpressions = ExpressionTable.StackTypeToNamesTable[stackTypes];
       var enabledStackExpressions = Content.EnabledExpressions.Intersect(stackExpressions).ToList();
+      var stackNames = string.Join(", ", stackTypes.ToValues().Select(type => type.ToString()).OrderBy(x => x));
 
       node.Text = string.Format(
                 "{0} ({1}/{2})",
-                Enum.GetName(typeof(StackTypes), stackType),
+                stackNames,
                 enabledStackExpressions.Count,
-                ExpressionTable.StackTypeToNamesTable[stackType].Count);
+                stackExpressions.Count);
     }
   }