Changeset 14875 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/YankDuplicateExpressions.cs

Timestamp:

04/18/17 01:15:25 (7 years ago)

Author:

pkimmesw

Message:

#2665 BenchmarkSuite, all examples, partially tested, VectorExpressions added

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/YankDuplicateExpressions.cs (modified) (4 diffs)

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
+  using System;
   using System.Collections.Generic;
-
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Stack;
+  using Attributes;
+  using Interpreter;
+  using Stack;
 
   /// <summary>
@@ -13 +13 @@
   public abstract class YankDuplicateExpression<T> : StatelessExpression {
     public bool Eval(IPushStack<T> stack, IPushStack<long> integerStack) {
-      T item;
-      if (!this.TryGetItem(stack, integerStack, out item))
+      if ((stack == integerStack && integerStack.Count < 2) ||
+          (stack != integerStack && (integerStack.IsEmpty || stack.IsEmpty)))
         return false;
 
-      stack.Push(item);
-      return true;
-    }
-
-    public bool Eval(IPushStack<Expression> stack, IPushStack<long> integerStack) {
-      Expression item;
-      if (!this.TryGetItem(stack, integerStack, out item))
-        return false;
-
-      stack.Push(item);
-      return true;
-    }
-
-    public bool Eval(IPushStack<long> integerStack) {
-      if ((integerStack.Count < 2) || (integerStack.Top > integerStack.Count - 2) ||
-          (integerStack.Top < 0)) return false;
-
-      var index = (int)integerStack.Pop();
-      var item = integerStack.ReverseElementAt(index);
-
-      integerStack.Push(item);
-      return true;
-    }
-
-    private bool TryGetItem<E>(IPushStack<E> stack, IPushStack<long> integerStack, out E item) {
-      if ((integerStack.Count == 0) ||
-          (integerStack.Top >= stack.Count) ||
-          (integerStack.Top < 0) ||
-          (stack.Count < 2)) {
-        item = default(E);
-        return false;
-      }
-
-      var index = (int)integerStack.Pop();
-      item = stack.ReverseElementAt(index);
-
+      var index = (int)Math.Abs(integerStack.Pop() % stack.Count);
+      stack.Push(stack[index]);
       return true;
     }
@@ -60 +26 @@
   public class IntegerYankDuplicateExpression : YankDuplicateExpression<long> {
     public override bool Eval(IInternalPushInterpreter interpreter) {
-      return this.Eval(interpreter.IntegerStack);
+      return this.Eval(interpreter.IntegerStack, interpreter.IntegerStack);
     }
   }
@@ -119 +85 @@
     }
   }
+
+  [PushExpression(StackTypes.FloatVector, "FLOAT[].YANKDUP", StackTypes.Integer)]
+  public class FloatVectorYankDuplicateExpression : YankDuplicateExpression<List<double>> {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      return Eval(interpreter.FloatVectorStack, interpreter.IntegerStack);
+    }
+  }
+
+  [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].YANKDUP", StackTypes.Integer)]
+  public class BooleanVectorYankDuplicateExpression : YankDuplicateExpression<List<bool>> {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      return Eval(interpreter.BooleanVectorStack, interpreter.IntegerStack);
+    }
+  }
+
+  [PushExpression(StackTypes.StringVector, "STRING[].YANKDUP", StackTypes.Integer)]
+  public class StringVectorYankDuplicateExpression : YankDuplicateExpression<List<string>> {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      return Eval(interpreter.StringVectorStack, interpreter.IntegerStack);
+    }
+  }
 }