Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/VectorTakeExpressions.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/VectorTakeExpressions.cs (modified) (2 diffs)

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

@@ -2 +2 @@
 
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
+  using System;
+  using System.Linq;
+
   using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Extensions;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Stack;
@@ -17 +21 @@
     protected VectorTakeExpression(bool deserializing) : base(deserializing) { }
 
-    protected bool IsNoop(IInternalPushInterpreter interpreter, IPushStack<List<T>> vectorStack) {
+    protected bool IsNoop(IInternalPushInterpreter interpreter, IPushStack<IReadOnlyList<T>> vectorStack) {
       return vectorStack.IsEmpty || interpreter.IntegerStack.IsEmpty;
     }
 
-    protected void Eval(IInternalPushInterpreter interpreter, IPushStack<List<T>> vectorStack) {
-      var count = (int)interpreter.IntegerStack.Pop();
+    protected void Eval(IInternalPushInterpreter interpreter, IPushStack<IReadOnlyList<T>> vectorStack) {
 
       if (vectorStack.Top.Count == 0)
         return;
 
-      count %= vectorStack.Top.Count;
+      var count = interpreter.IntegerStack.Pop().AsInt(vectorStack.Top.Count);
 
       if (count < 0)
         count *= -1;
 
-      var result = vectorStack.Top.GetRange(0, count);
-      vectorStack.SetTop(result);
+      var vector = vectorStack.Top;
+      var list = vector as List<T>;
+
+      if (list != null) {
+        var newTop = new T[count];
+        list.CopyTo(0, newTop, 0, count);
+        vectorStack.Top = newTop;
+        return;
+      }
+
+      var array = vector as T[];
+      if (array != null) {
+        var newTop = new T[count];
+        Array.Copy(array, 0, newTop, 0, count);
+        vectorStack.Top = newTop;
+        return;
+      }
+
+      vectorStack.Top = vector.Take(count).ToArray();
     }
   }