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

Timestamp:

05/10/17 11:23:05 (7 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/PopExpressions.cs (modified) (2 diffs)

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

@@ -2 +2 @@
   using System.Collections.Generic;
 
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
 
@@ -7 +8 @@
   using Stack;
 
+  [StorableClass]
   public abstract class PopExpression<T> : StatelessExpression {
-    public bool Eval(IPushStack<T> stack) {
-      if (stack.Count == 0) return false;
-
+    protected PopExpression() { }
+    [StorableConstructor]
+    protected PopExpression(bool deserializing) : base(deserializing) { }
+
+    protected void Eval(IPushStack<T> stack) {
       stack.Pop();
-      return true;
-    }
-  }
-
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Integer, "INTEGER.POP")]
   public class IntegerPopExpression : PopExpression<long> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.IntegerStack);
-    }
-  }
-
+    public IntegerPopExpression() { }
+    [StorableConstructor]
+    protected IntegerPopExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.IntegerStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Float, "FLOAT.POP")]
   public class FloatPopExpression : PopExpression<double> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.FloatStack);
-    }
-  }
-
+    public FloatPopExpression() { }
+    [StorableConstructor]
+    protected FloatPopExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.FloatStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.FloatStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Boolean, "BOOLEAN.POP")]
   public class BooleanPopExpression : PopExpression<bool> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.BooleanStack);
-    }
-  }
-
+    public BooleanPopExpression() { }
+    [StorableConstructor]
+    protected BooleanPopExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.BooleanStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.BooleanStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Name, "NAME.POP")]
   public class NamePopExpression : PopExpression<string> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.NameStack);
-    }
-  }
-
+    public NamePopExpression() { }
+    [StorableConstructor]
+    protected NamePopExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.NameStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.NameStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Exec, "EXEC.POP")]
   public class ExecPopExpression : PopExpression<Expression> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.ExecStack);
-    }
-  }
-
+    public ExecPopExpression() { }
+    [StorableConstructor]
+    protected ExecPopExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.ExecStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.ExecStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Code, "CODE.POP")]
   public class CodePopExpression : PopExpression<Expression> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.CodeStack);
-    }
-  }
-
+    public CodePopExpression() { }
+    [StorableConstructor]
+    protected CodePopExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.CodeStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.CodeStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Char, "CHAR.POP")]
   public class CharPopExpression : PopExpression<char> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.CharStack);
-    }
-  }
-
+    public CharPopExpression() { }
+    [StorableConstructor]
+    protected CharPopExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.CharStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.CharStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.String, "STRING.POP")]
   public class StringPopExpression : PopExpression<string> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.StringStack);
-    }
-  }
-
+    public StringPopExpression() { }
+    [StorableConstructor]
+    protected StringPopExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.StringStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.StringStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.IntegerVector, "INTEGER[].POP")]
   public class IntegerVectorPopExpression : PopExpression<List<long>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.IntegerVectorStack);
-    }
-  }
-
-
+    public IntegerVectorPopExpression() { }
+    [StorableConstructor]
+    protected IntegerVectorPopExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerVectorStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.IntegerVectorStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.FloatVector, "FLOAT[].POP")]
   public class FloatVectorPopExpression : PopExpression<List<double>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.FloatVectorStack);
-    }
-  }
-
-
+    public FloatVectorPopExpression() { }
+    [StorableConstructor]
+    protected FloatVectorPopExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.FloatVectorStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.FloatVectorStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].POP")]
   public class BooleanVectorPopExpression : PopExpression<List<bool>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.BooleanVectorStack);
-    }
-  }
-
-
+    public BooleanVectorPopExpression() { }
+    [StorableConstructor]
+    protected BooleanVectorPopExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.BooleanVectorStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.BooleanVectorStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.StringVector, "STRING[].POP")]
   public class StringVectorPopExpression : PopExpression<List<string>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.StringVectorStack);
+    public StringVectorPopExpression() { }
+    [StorableConstructor]
+    protected StringVectorPopExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.StringVectorStack.IsEmpty;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.StringVectorStack);
     }
   }