Changeset 15189 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/PushProgram.cs

Timestamp:

07/10/17 21:36:03 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed small issues, testet benchmark suite, added INX Expressions

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/PushProgram.cs (modified) (4 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/PushProgram.cs

@@ -8 +8 @@
   using Data.Pool;
   using Extensions;
+
+  using HeuristicLab.Common;
+
   using Interpreter;
   using Persistence.Default.CompositeSerializers.Storable;
@@ -41 +44 @@
     }
 
+    public PushProgram(PushProgram origin, Cloner cloner) {
+      stringRepresentation = origin.stringRepresentation;
+      hashCode = origin.hashCode;
+      depth = origin.depth;
+      treeIndex = origin.treeIndex;
+      expressions = new List<Expression>(origin.expressions);
+    }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PushProgram(this, cloner);
+    }
+
     public bool IsEmpty { get { return Count == 0; } }
     public int Count { get { return expressions.Count; } }
@@ -51 +66 @@
       return program;
     }
+
+    void IPooledObject.Init() { }
 
     void IPooledObject.Reset() {
@@ -263 +280 @@
             yield return sub;
         else yield return expr;
+      }
+    }
+
+    public IReadOnlyList<Expression> Flatten() {
+      var result = new List<Expression>();
+      Flatten(result);
+      return result;
+    }
+
+    private void Flatten(List<Expression> result) {
+      result.AddRange(expressions);
+
+      for (var i = 0; i < expressions.Count; i++) {
+        var expr = expressions[i];
+        if (expr.IsProgram) {
+          ((PushProgram)expr).Flatten(result);
+        }
       }
     }