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

Timestamp:

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

Author:

pkimmesw

Message:

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

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/ShoveExpressions.cs (modified) (3 diffs)

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
+  using System;
   using System.Collections.Generic;
 
-  using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
-
+  using Attributes;
   using Interpreter;
   using Stack;
 
   public abstract class ShoveExpression<T> : StatelessExpression {
-    protected bool Eval(IPushStack<T> stack, IPushStack<long> integerStack, int count = 1) {
-      if (integerStack.Count == 0 ||
-          integerStack.Top > stack.Count - count ||
-          integerStack.Top < 0 ||
-          stack.Count < 2)
+    protected bool Eval(IPushStack<T> stack, IPushStack<long> integerStack) {
+      if ((stack == integerStack && integerStack.Count < 3) ||
+          (stack != integerStack && (integerStack.IsEmpty || stack.Count < 2)))
         return false;
 
-      var index = (int)integerStack.Pop();
+      var index = (int)Math.Abs(integerStack.Pop() % stack.Count);
       var item = stack.Pop();
-
       stack.Insert(index, item);
       return true;
@@ -26 +23 @@
   public class IntegerShoveExpression : ShoveExpression<long> {
     public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.IntegerStack, interpreter.IntegerStack, 2);
+      return Eval(interpreter.IntegerStack, interpreter.IntegerStack);
     }
   }
@@ -85 +82 @@
     }
   }
+
+  [PushExpression(StackTypes.FloatVector, "FLOAT[].SHOVE", StackTypes.Integer)]
+  public class FloatVectorShoveExpression : ShoveExpression<List<double>> {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      return Eval(interpreter.FloatVectorStack, interpreter.IntegerStack);
+    }
+  }
+
+  [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].SHOVE", StackTypes.Integer)]
+  public class BooleanVectorShoveExpression : ShoveExpression<List<bool>> {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      return Eval(interpreter.BooleanVectorStack, interpreter.IntegerStack);
+    }
+  }
+
+  [PushExpression(StackTypes.StringVector, "STRING[].SHOVE", StackTypes.Integer)]
+  public class StringVectorShoveExpression : ShoveExpression<List<string>> {
+    public override bool Eval(IInternalPushInterpreter interpreter) {
+      return Eval(interpreter.StringVectorStack, interpreter.IntegerStack);
+    }
+  }
 }