Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/VectorConcatExpressions.cs

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

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/VectorConcatExpressions.cs (modified) (1 diff)

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

@@ -16 +16 @@
     protected VectorConcatExpression(bool deserializing) : base(deserializing) { }
 
-    protected bool IsNoop(IInternalPushInterpreter interpreter, IPushStack<List<T>> vectorStack) {
+    protected bool IsNoop(IInternalPushInterpreter interpreter, IPushStack<IReadOnlyList<T>> vectorStack) {
       return vectorStack.Count < 2 ||
              vectorStack.Top.Count + vectorStack[1].Count > interpreter.Configuration.MaxVectorLength;
     }
 
-    protected void Eval(IInternalPushInterpreter interpter, IPushStack<List<T>> vectorStack) {
+    protected void Eval(IInternalPushInterpreter interpter, IPushStack<IReadOnlyList<T>> vectorStack) {
       var first = vectorStack.Pop();
       var second = vectorStack.Top;
-      var result = new T[first.Count + second.Count];
+      var result = new List<T>(second.Count + first.Count);
+      result.AddRange(second);
+      result.AddRange(first);
 
-      first.CopyTo(result, 0);
-      second.CopyTo(result, first.Count);
-      vectorStack.SetTop(new List<T>(result));
+      vectorStack.Top = result;
     }
   }