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

Timestamp:

04/10/17 00:27:31 (7 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/DuplicateExpressions.cs (modified) (8 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/DuplicateExpressions.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 DuplicateExpression<T> : StatelessExpression {
-    protected bool Eval(IStack<T> stack) {
+    protected bool Eval(IPushStack<T> stack) {
       if (stack.Count == 0) return false;
 
@@ -17 +19 @@
       return true;
     }
-
-    protected bool Eval(IStack<Expression> stack) {
-      if (stack.Count == 0) return false;
-
-      var top = stack.Top;
-
-      stack.Push(top);
-      return true;
-    }
   }
 
   [PushExpression(StackTypes.Integer, "INTEGER.DUP")]
   public class IntegerDuplicateExpression : DuplicateExpression<long> {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return this.Eval(interpreter.IntegerStack);
     }
@@ -37 +30 @@
   [PushExpression(StackTypes.Float, "FLOAT.DUP")]
   public class FloatDuplicateExpression : DuplicateExpression<double> {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return this.Eval(interpreter.FloatStack);
     }
@@ -44 +37 @@
   [PushExpression(StackTypes.Boolean, "BOOLEAN.DUP")]
   public class BooleanDuplicateExpression : DuplicateExpression<bool> {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return this.Eval(interpreter.BooleanStack);
     }
@@ -51 +44 @@
   [PushExpression(StackTypes.Name, "NAME.DUP")]
   public class NameDuplicateExpression : DuplicateExpression<string> {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return this.Eval(interpreter.NameStack);
     }
@@ -58 +51 @@
   [PushExpression(StackTypes.Exec, "EXEC.DUP")]
   public class ExecDuplicateExpression : DuplicateExpression<Expression> {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return this.Eval(interpreter.ExecStack);
     }
@@ -65 +58 @@
   [PushExpression(StackTypes.Code, "CODE.DUP")]
   public class CodeDuplicateExpression : DuplicateExpression<Expression> {
-    public override bool Eval(IPushInterpreter interpreter) {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
       return this.Eval(interpreter.CodeStack);
     }
   }
+
+  [PushExpression(StackTypes.IntegerVector, "INTEGER[].DUP")]
+  public class IntegerVectorDuplicateExpression : DuplicateExpression<List<long>> {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      return this.Eval(interpreter.IntegerVectorStack);
+    }
+  }
 }