Changeset 14834 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/YankExpressions.cs

Timestamp:

04/10/17 00:27:31 (8 years ago)

Author:

pkimmesw

Message:

#2665 LexicaseSelector, Performance improvements, UI Fixes, Debugger only shows used stacks, fixed Debugger stepping, Added vector expressions, ERCOptions,

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/YankExpressions.cs (modified) (10 diffs)

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
+  using System.Collections.Generic;
+
   using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
@@ -10 +12 @@
   /// <typeparam name="T">Stacktype</typeparam>
   public abstract class YankExpression<T> : StatelessExpression {
-    public bool Eval(IStack<T> stack, IStack<long> integerStack, int count = 1) {
+    public bool Eval(IPushStack<T> stack, IPushStack<long> integerStack, int count = 1) {
       if (integerStack.Count == 0) return false;
 
@@ -26 +28 @@
   [PushExpression(StackTypes.Integer, "INTEGER.YANK")]
   public class IntegerYankExpression : YankExpression<long> {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return this.Eval(interpreter.IntegerStack, interpreter.IntegerStack, 2);
     }
@@ -33 +35 @@
   [PushExpression(StackTypes.Float, "FLOAT.YANK", StackTypes.Integer)]
   public class FloatYankExpression : YankExpression<double> {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return this.Eval(interpreter.FloatStack, interpreter.IntegerStack);
     }
@@ -40 +42 @@
   [PushExpression(StackTypes.Boolean, "BOOLEAN.YANK", StackTypes.Integer)]
   public class BooleanYankExpression : YankExpression<bool> {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return this.Eval(interpreter.BooleanStack, interpreter.IntegerStack);
     }
@@ -47 +49 @@
   [PushExpression(StackTypes.Name, "NAME.YANK", StackTypes.Integer)]
   public class NameYankExpression : YankExpression<string> {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return this.Eval(interpreter.NameStack, interpreter.IntegerStack);
     }
@@ -54 +56 @@
   [PushExpression(StackTypes.Exec, "EXEC.YANK", StackTypes.Integer)]
   public class ExecYankExpression : YankExpression<Expression> {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return this.Eval(interpreter.ExecStack, interpreter.IntegerStack);
     }
@@ -61 +63 @@
   [PushExpression(StackTypes.Code, "CODE.YANK", StackTypes.Integer)]
   public class CodeYankExpression : YankExpression<Expression> {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return this.Eval(interpreter.CodeStack, interpreter.IntegerStack);
     }
@@ -68 +70 @@
   [PushExpression(StackTypes.Char, "CHAR.YANK", StackTypes.Integer)]
   public class CharYankExpression : YankExpression<char> {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return Eval(interpreter.CharStack, interpreter.IntegerStack);
     }
@@ -75 +77 @@
   [PushExpression(StackTypes.String, "STRING.YANK", StackTypes.Integer)]
   public class StringYankExpression : YankExpression<string> {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return Eval(interpreter.StringStack, interpreter.IntegerStack);
     }
   }
+
+  [PushExpression(StackTypes.IntegerVector, "INTEGER[].YANK", StackTypes.Integer)]
+  public class IntegerVectorYankExpression : YankExpression<List<long>> {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      return Eval(interpreter.IntegerVectorStack, interpreter.IntegerStack);
+    }
+  }
 }