Changeset 14952 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/SwapExpressions.cs

Timestamp:

05/10/17 11:23:05 (8 years ago)

Author:

pkimmesw

Message:

#2665 Added IsNoop to Expression, Made Expressions storable, Fixed Debugger, Fixed and improved problem data and result visualisation, Added custom ErcOption view, Added problem difficulty to problem data name

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/SwapExpressions.cs (modified) (2 diffs)

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

@@ -2 +2 @@
   using System.Collections.Generic;
 
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
 
@@ -11 +12 @@
   /// </summary>
   /// <typeparam name="T">Stacktype</typeparam>
+  [StorableClass]
   public abstract class SwapExpression<T> : StatelessExpression {
-    public bool Eval(IPushStack<T> stack) {
-      if (stack.Count < 2)
-        return false;
-
+    protected SwapExpression() { }
+    [StorableConstructor]
+    protected SwapExpression(bool deserializing) : base(deserializing) { }
+
+    protected void Eval(IPushStack<T> stack) {
       stack.Swap(2);
-      return true;
-    }
-  }
-
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Integer, "INTEGER.SWAP")]
   public class IntegerSwapExpression : SwapExpression<long> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.IntegerStack);
-    }
-  }
-
+    public IntegerSwapExpression() { }
+    [StorableConstructor]
+    protected IntegerSwapExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.IntegerStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Float, "FLOAT.SWAP")]
   public class FloatSwapExpression : SwapExpression<double> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.FloatStack);
-    }
-  }
-
+    public FloatSwapExpression() { }
+    [StorableConstructor]
+    protected FloatSwapExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.FloatStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.FloatStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Boolean, "BOOLEAN.SWAP")]
   public class BooleanSwapExpression : SwapExpression<bool> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.BooleanStack);
-    }
-  }
-
+    public BooleanSwapExpression() { }
+    [StorableConstructor]
+    protected BooleanSwapExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.BooleanStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.BooleanStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Name, "NAME.SWAP")]
   public class NameSwapExpression : SwapExpression<string> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.NameStack);
-    }
-  }
-
+    public NameSwapExpression() { }
+    [StorableConstructor]
+    protected NameSwapExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.NameStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.NameStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Exec, "EXEC.SWAP")]
   public class ExecSwapExpression : SwapExpression<Expression> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.ExecStack);
-    }
-  }
-
+    public ExecSwapExpression() { }
+    [StorableConstructor]
+    protected ExecSwapExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.ExecStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.ExecStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Code, "CODE.SWAP")]
   public class CodeSwapExpression : SwapExpression<Expression> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.CodeStack);
-    }
-  }
-
+    public CodeSwapExpression() { }
+    [StorableConstructor]
+    protected CodeSwapExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.CodeStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.CodeStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Char, "CHAR.SWAP")]
   public class CharSwapExpression : SwapExpression<char> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.CharStack);
-    }
-  }
-
+    public CharSwapExpression() { }
+    [StorableConstructor]
+    protected CharSwapExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.CharStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.CharStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.String, "STRING.SWAP")]
   public class StringSwapExpression : SwapExpression<string> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.StringStack);
-    }
-  }
-
+    public StringSwapExpression() { }
+    [StorableConstructor]
+    protected StringSwapExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.StringStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.StringStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.IntegerVector, "INTEGER[].SWAP")]
   public class IntegerVectorSwapExpression : SwapExpression<List<long>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.IntegerVectorStack);
-    }
-  }
-
+    public IntegerVectorSwapExpression() { }
+    [StorableConstructor]
+    protected IntegerVectorSwapExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerVectorStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.IntegerVectorStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.FloatVector, "FLOAT[].SWAP")]
   public class FloatVectorSwapExpression : SwapExpression<List<double>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.FloatVectorStack);
-    }
-  }
-
+    public FloatVectorSwapExpression() { }
+    [StorableConstructor]
+    protected FloatVectorSwapExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.FloatVectorStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.FloatVectorStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].SWAP")]
   public class BooleanVectorSwapExpression : SwapExpression<List<bool>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.BooleanVectorStack);
-    }
-  }
-
+    public BooleanVectorSwapExpression() { }
+    [StorableConstructor]
+    protected BooleanVectorSwapExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.BooleanVectorStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.BooleanVectorStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.StringVector, "STRING[].SWAP")]
   public class StringVectorSwapExpression : SwapExpression<List<string>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.StringVectorStack);
+    public StringVectorSwapExpression() { }
+    [StorableConstructor]
+    protected StringVectorSwapExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.StringVectorStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.StringVectorStack);
     }
   }