Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Data/Tree

Timestamp:

06/01/17 09:28:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed Benchmark Problem Definition, Converted LoopExpressions to stateless expressions, Added several unit test to ensure funcionality, Fixed UI bugs

Location:

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Data/Tree

Files:

• Tree.cs (deleted)
• TreeExtensions.cs (modified) (4 diffs)
• TreeNode.cs (modified) (2 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Data/Tree/TreeExtensions.cs

@@ -8 +8 @@
 
   public static class TreeExtensions {
-    public static Tree<T> ToTree<T>(
+    private static readonly Expression ExecNoop = ExpressionTable.GetStatelessExpression<ExecNoopExpression>();
+    private static readonly Expression CodeNoop = ExpressionTable.GetStatelessExpression<CodeNoopExpression>();
+
+    public static TreeNode<T> ToTree<T>(
       this IEnumerable<T> items,
       Predicate<T> isChild,
       Func<T, IReadOnlyList<T>> childrenResolver) {
-      var tree = new Tree<T>();
+      var tree = new TreeNode<T>();
 
       foreach (var item in items) {
@@ -35 +38 @@
         } else yield return child;
       }
+
+      yield return node;
     }
 
@@ -46 +51 @@
     }
 
+    public static PushProgram ToPushProgramWithoutNoopExpressions(this TreeNode<Expression> tree) {
+      return ToPushProgram(tree, e => !ReferenceEquals(e, ExecNoop) && !ReferenceEquals(e, CodeNoop));
+    }
+
     public static PushProgram ToPushProgram(this TreeNode<Expression> tree, Func<Expression, bool> condition = null) {
+      // wrap into program as depthlast expects that tree represents program and not a single expression
+      if (tree.Count == 1) {
+        var tmp = tree;
+        tree = new TreeNode<Expression>();
+        tree.AddNode(tmp);
+      }
+
       var expressions = tree.DepthLast(e => ResolveProgram(e, condition));
 
@@ -52 +68 @@
     }
 
-    public static Tree<Expression> ToTree(this PushProgram program) {
+    public static TreeNode<Expression> ToTree(this PushProgram program) {
       var tree = program.Expressions.ToTree(e => e.IsProgram, e => ((PushProgram)e).Expressions);
       tree.Value = program;

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Data/Tree/TreeNode.cs

@@ -5 +5 @@
     public T Value { get; set; }
     public IList<TreeNode<T>> Children { get; private set; }
+    public int Count { get; private set; }
 
     public TreeNode() {
       Children = new List<TreeNode<T>>();
+      Count = 1;
     }
 
@@ -16 +18 @@
     public void Add(T value) {
       Children.Add(new TreeNode<T>(value));
+      Count++;
     }
 
     public void AddNode(TreeNode<T> node) {
       Children.Add(node);
+      Count += node.Count;
     }
 
     public void ReplaceNode(int index, TreeNode<T> node) {
+      Count -= Children[index].Count;
       Children[index] = node;
+      Count += node.Count;
     }
   }