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

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

@@ -5 +5 @@
   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;
@@ -25 +26 @@
 
     protected void Eval(IPushStack<T> stack, IPushStack<long> integerStack) {
-      var index = (int)Math.Abs(integerStack.Pop() % stack.Count);
+      var index = integerStack.Pop().AsInt(stack.Count);
       stack.Yank(index);
     }
@@ -95 +96 @@
 
   [StorableClass]
-  [PushExpression(StackTypes.Exec, "EXEC.YANK", StackTypes.Integer)]
+  [PushExpression(StackTypes.Exec, "EXEC.YANK", StackTypes.Integer, execIn: 0)]
   public class ExecYankExpression : YankExpression<Expression> {
     public ExecYankExpression() { }
@@ -160 +161 @@
   [StorableClass]
   [PushExpression(StackTypes.IntegerVector, "INTEGER[].YANK", StackTypes.Integer)]
-  public class IntegerVectorYankExpression : YankExpression<List<long>> {
+  public class IntegerVectorYankExpression : YankExpression<IReadOnlyList<long>> {
     public IntegerVectorYankExpression() { }
     [StorableConstructor]
@@ -176 +177 @@
   [StorableClass]
   [PushExpression(StackTypes.FloatVector, "FLOAT[].YANK", StackTypes.Integer)]
-  public class FloatVectorYankExpression : YankExpression<List<double>> {
+  public class FloatVectorYankExpression : YankExpression<IReadOnlyList<double>> {
     public FloatVectorYankExpression() { }
     [StorableConstructor]
@@ -192 +193 @@
   [StorableClass]
   [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].YANK", StackTypes.Integer)]
-  public class BooleanVectorYankExpression : YankExpression<List<bool>> {
+  public class BooleanVectorYankExpression : YankExpression<IReadOnlyList<bool>> {
     public BooleanVectorYankExpression() { }
     [StorableConstructor]
@@ -208 +209 @@
   [StorableClass]
   [PushExpression(StackTypes.StringVector, "STRING[].YANK", StackTypes.Integer)]
-  public class StringVectorYankExpression : YankExpression<List<string>> {
+  public class StringVectorYankExpression : YankExpression<IReadOnlyList<string>> {
     public StringVectorYankExpression() { }
     [StorableConstructor]