Changeset 14909 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/VectorSubExpressions.cs

Timestamp:

05/03/17 01:31:10 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed VectorExpression errors, Fixed BenchmarkSuite Problem Data View issues

File:

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

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

@@ -16 +16 @@
       if (vectorStack.IsEmpty || interpreter.IntegerStack.Count < 2) return false;
 
-      var first = (int)Math.Min(vectorStack.Count, Math.Max(0, interpreter.IntegerStack[1]));
-      var second = (int)Math.Min(vectorStack.Count, Math.Max(first, interpreter.IntegerStack.Top));
+      var first = (int)Math.Min(vectorStack.Top.Count, Math.Max(0, interpreter.IntegerStack[1]));
+      var second = (int)Math.Min(vectorStack.Top.Count, Math.Max(first, interpreter.IntegerStack.Top));
       interpreter.IntegerStack.Remove(2);
 
+      if (vectorStack.Top.Count == 0)
+        return true;
+
       var result = vectorStack.Top.GetRange(first, second - first);
-      vectorStack.Push(result);
+      vectorStack.SetTop(result);
       return true;
     }