Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/ShoveExpressions.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/ShoveExpressions.cs (modified) (8 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;
 
@@ -6 +5 @@
 
   using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Extensions;
 
   using Interpreter;
@@ -17 +17 @@
 
     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);
       var item = stack.Pop();
       stack.Insert(index, item);
@@ -87 +87 @@
   }
 
-  [PushExpression(StackTypes.Exec, "EXEC.SHOVE", StackTypes.Integer)]
+  [PushExpression(StackTypes.Exec, "EXEC.SHOVE", StackTypes.Integer, execIn: 1)]
   [StorableClass]
   public class ExecShoveExpression : ShoveExpression<Expression> {
@@ -153 +153 @@
   [PushExpression(StackTypes.IntegerVector, "INTEGER[].SHOVE", StackTypes.Integer)]
   [StorableClass]
-  public class IntegerVectorShoveExpression : ShoveExpression<List<long>> {
+  public class IntegerVectorShoveExpression : ShoveExpression<IReadOnlyList<long>> {
     public IntegerVectorShoveExpression() { }
     [StorableConstructor]
@@ -169 +169 @@
   [PushExpression(StackTypes.FloatVector, "FLOAT[].SHOVE", StackTypes.Integer)]
   [StorableClass]
-  public class FloatVectorShoveExpression : ShoveExpression<List<double>> {
+  public class FloatVectorShoveExpression : ShoveExpression<IReadOnlyList<double>> {
     public FloatVectorShoveExpression() { }
     [StorableConstructor]
@@ -185 +185 @@
   [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].SHOVE", StackTypes.Integer)]
   [StorableClass]
-  public class BooleanVectorShoveExpression : ShoveExpression<List<bool>> {
+  public class BooleanVectorShoveExpression : ShoveExpression<IReadOnlyList<bool>> {
     public BooleanVectorShoveExpression() { }
     [StorableConstructor]
@@ -201 +201 @@
   [PushExpression(StackTypes.StringVector, "STRING[].SHOVE", StackTypes.Integer)]
   [StorableClass]
-  public class StringVectorShoveExpression : ShoveExpression<List<string>> {
+  public class StringVectorShoveExpression : ShoveExpression<IReadOnlyList<string>> {
     public StringVectorShoveExpression() { }
     [StorableConstructor]