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

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

@@ -2 +2 @@
   using System.Collections.Generic;
 
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
@@ -10 +11 @@
   /// </summary>
   /// <typeparam name="T"></typeparam>
+  [StorableClass]
   public abstract class VectorPushAllExpression<T> : StatelessExpression {
-    protected bool Eval(IPushStack<List<T>> vectorStack, IPushStack<T> literalStack) {
-      if (vectorStack.IsEmpty)
-        return false;
+    protected VectorPushAllExpression() { }
+    [StorableConstructor]
+    protected VectorPushAllExpression(bool deserializing) : base(deserializing) { }
 
+    protected bool IsNoop(IPushStack<List<T>> vectorStack) {
+      return vectorStack.IsEmpty;
+    }
+
+    protected void Eval(IPushStack<List<T>> vectorStack, IPushStack<T> literalStack) {
       var vector = vectorStack.Pop();
       vector.Reverse();
       literalStack.Push(vector);
-      return true;
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.IntegerVector, "INTEGER[].PUSHALL", StackTypes.Integer)]
   public class IntegerVectorPushAllExpression : VectorPushAllExpression<long> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.IntegerVectorStack, interpreter.IntegerStack);
+    public IntegerVectorPushAllExpression() { }
+    [StorableConstructor]
+    protected IntegerVectorPushAllExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.IntegerVectorStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.IntegerVectorStack, interpreter.IntegerStack);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.FloatVector, "FLOAT[].PUSHALL", StackTypes.Float)]
   public class FloatVectorPushAllExpression : VectorPushAllExpression<double> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.FloatVectorStack, interpreter.FloatStack);
+    public FloatVectorPushAllExpression() { }
+    [StorableConstructor]
+    protected FloatVectorPushAllExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.FloatVectorStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.FloatVectorStack, interpreter.FloatStack);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].PUSHALL", StackTypes.Boolean)]
   public class BooleanVectorPushAllExpression : VectorPushAllExpression<bool> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.BooleanVectorStack, interpreter.BooleanStack);
+    public BooleanVectorPushAllExpression() { }
+    [StorableConstructor]
+    protected BooleanVectorPushAllExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.BooleanVectorStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.BooleanVectorStack, interpreter.BooleanStack);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.StringVector, "STRING[].PUSHALL", StackTypes.String)]
   public class StringVectorPushAllExpression : VectorPushAllExpression<string> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.StringVectorStack, interpreter.StringStack);
+    public StringVectorPushAllExpression() { }
+    [StorableConstructor]
+    protected StringVectorPushAllExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.StringVectorStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.StringVectorStack, interpreter.StringStack);
     }
   }