Changeset 15017 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/SwapExpressions.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/SwapExpressions.cs (modified) (5 diffs)

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

@@ -88 +88 @@
 
   [StorableClass]
-  [PushExpression(StackTypes.Exec, "EXEC.SWAP")]
+  [PushExpression(StackTypes.Exec, "EXEC.SWAP", execIn: 2)]
   public class ExecSwapExpression : SwapExpression<Expression> {
     public ExecSwapExpression() { }
@@ -153 +153 @@
   [StorableClass]
   [PushExpression(StackTypes.IntegerVector, "INTEGER[].SWAP")]
-  public class IntegerVectorSwapExpression : SwapExpression<List<long>> {
+  public class IntegerVectorSwapExpression : SwapExpression<IReadOnlyList<long>> {
     public IntegerVectorSwapExpression() { }
     [StorableConstructor]
@@ -169 +169 @@
   [StorableClass]
   [PushExpression(StackTypes.FloatVector, "FLOAT[].SWAP")]
-  public class FloatVectorSwapExpression : SwapExpression<List<double>> {
+  public class FloatVectorSwapExpression : SwapExpression<IReadOnlyList<double>> {
     public FloatVectorSwapExpression() { }
     [StorableConstructor]
@@ -185 +185 @@
   [StorableClass]
   [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].SWAP")]
-  public class BooleanVectorSwapExpression : SwapExpression<List<bool>> {
+  public class BooleanVectorSwapExpression : SwapExpression<IReadOnlyList<bool>> {
     public BooleanVectorSwapExpression() { }
     [StorableConstructor]
@@ -201 +201 @@
   [StorableClass]
   [PushExpression(StackTypes.StringVector, "STRING[].SWAP")]
-  public class StringVectorSwapExpression : SwapExpression<List<string>> {
+  public class StringVectorSwapExpression : SwapExpression<IReadOnlyList<string>> {
     public StringVectorSwapExpression() { }
     [StorableConstructor]