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

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/VectorRestExpressions.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 VectorRestExpression<T> : StatelessExpression {
-    protected bool Eval(IPushStack<List<T>> vectorStack) {
-      if (vectorStack.IsEmpty || vectorStack.Top.Count < 2)
-        return false;
+    protected VectorRestExpression() { }
+    [StorableConstructor]
+    protected VectorRestExpression(bool deserializing) : base(deserializing) { }
 
+    protected bool IsNoop(IPushStack<List<T>> vectorStack) {
+      return vectorStack.IsEmpty || vectorStack.Top.Count < 2;
+    }
+
+    protected void Eval(IPushStack<List<T>> vectorStack) {
       var result = vectorStack.Top.GetRange(1, vectorStack.Top.Count - 1);
       vectorStack.SetTop(result);
-      return true;
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.IntegerVector, "INTEGER[].REST")]
   public class IntegerVectorRestExpression : VectorRestExpression<long> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.IntegerVectorStack);
+    public IntegerVectorRestExpression() { }
+    [StorableConstructor]
+    protected IntegerVectorRestExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.IntegerVectorStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.IntegerVectorStack);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.FloatVector, "FLOAT[].REST")]
   public class FloatVectorRestExpression : VectorRestExpression<double> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.FloatVectorStack);
+    public FloatVectorRestExpression() { }
+    [StorableConstructor]
+    protected FloatVectorRestExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.FloatVectorStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.FloatVectorStack);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].REST")]
   public class BooleanVectorRestExpression : VectorRestExpression<bool> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.BooleanVectorStack);
+    public BooleanVectorRestExpression() { }
+    [StorableConstructor]
+    protected BooleanVectorRestExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.BooleanVectorStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.BooleanVectorStack);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.StringVector, "STRING[].REST")]
   public class StringVectorRestExpression : VectorRestExpression<string> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.StringVectorStack);
+    public StringVectorRestExpression() { }
+    [StorableConstructor]
+    protected StringVectorRestExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.StringVectorStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.StringVectorStack);
     }
   }