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

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

@@ -4 +4 @@
   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 +18 @@
     protected VectorSetExpression(bool deserializing) : base(deserializing) { }
 
-    protected bool IsNoop(IInternalPushInterpreter interpreter, IPushStack<List<T>> vectorStack, IPushStack<T> literalStack, bool isLiteralTypeInteger = false) {
+    protected bool IsNoop(IInternalPushInterpreter interpreter, IPushStack<IReadOnlyList<T>> vectorStack, IPushStack<T> literalStack, bool isLiteralTypeInteger = false) {
       return vectorStack.IsEmpty ||
              vectorStack.Top.Count == 0 ||
@@ -27 +28 @@
     protected void Eval(
       IInternalPushInterpreter interpreter,
-      IPushStack<List<T>> vectorStack,
+      IPushStack<IReadOnlyList<T>> vectorStack,
       IPushStack<T> literalStack,
       bool isLiteralTypeInteger = false) {
       T literal;
-      int index;
+      long x;
 
       if (isLiteralTypeInteger) {
         literal = literalStack.Top;
-        index = (int)interpreter.IntegerStack[1];
+        x = interpreter.IntegerStack[1];
         interpreter.IntegerStack.Remove(2);
       } else {
         literal = literalStack.Pop();
-        index = (int)interpreter.IntegerStack.Pop();
+        x = interpreter.IntegerStack.Pop();
       }
 
-      var vector = vectorStack.Pop();
-      index = index % vector.Count;
+      var vector = vectorStack.Top;
+      var newTop = new List<T>(vector);
+      var index = x.AsInt(vector.Count);
 
       if (index < 0)
         index *= -1;
 
-      vector[index] = literal;
+      newTop[index] = literal;
+      vectorStack.Top = newTop;
     }
   }