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

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

@@ -4 +4 @@
   using System;
 
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
@@ -12 +13 @@
   /// </summary>
   /// <typeparam name="T"></typeparam>
+  [StorableClass]
   public abstract class VectorSubExpression<T> : StatelessExpression {
-    protected bool Eval(IInternalPushInterpreter interpreter, IPushStack<List<T>> vectorStack) {
-      if (vectorStack.IsEmpty || interpreter.IntegerStack.Count < 2) return false;
+    protected VectorSubExpression() { }
+    [StorableConstructor]
+    protected VectorSubExpression(bool deserializing) : base(deserializing) { }
 
+    protected bool IsNoop(IInternalPushInterpreter interpreter, IPushStack<List<T>> vectorStack) {
+      return vectorStack.IsEmpty || interpreter.IntegerStack.Count < 2;
+    }
+
+    protected void Eval(IInternalPushInterpreter interpreter, IPushStack<List<T>> vectorStack) {
       var first = (int)Math.Min(vectorStack.Top.Count, Math.Max(0, interpreter.IntegerStack[1]));
       var second = (int)Math.Min(vectorStack.Top.Count, Math.Max(first, interpreter.IntegerStack.Top));
@@ -21 +29 @@
 
       if (vectorStack.Top.Count == 0)
-        return true;
+        return;
 
       var result = vectorStack.Top.GetRange(first, second - first);
       vectorStack.SetTop(result);
-      return true;
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.IntegerVector, "INTEGER[].SUB", StackTypes.Integer)]
   public class IntegerVectorSubExpression : VectorSubExpression<long> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.IntegerVectorStack);
+    public IntegerVectorSubExpression() { }
+    [StorableConstructor]
+    protected IntegerVectorSubExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter, interpreter.IntegerVectorStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.IntegerVectorStack);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.FloatVector, "FLOAT[].SUB", StackTypes.Integer)]
   public class FloatVectorSubExpression : VectorSubExpression<double> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.FloatVectorStack);
+    public FloatVectorSubExpression() { }
+    [StorableConstructor]
+    protected FloatVectorSubExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter, interpreter.FloatVectorStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.FloatVectorStack);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].SUB", StackTypes.Integer)]
   public class BooleanVectorSubExpression : VectorSubExpression<bool> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.BooleanVectorStack);
+    public BooleanVectorSubExpression() { }
+    [StorableConstructor]
+    protected BooleanVectorSubExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter, interpreter.BooleanVectorStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.BooleanVectorStack);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.StringVector, "STRING[].SUB", StackTypes.Integer)]
   public class StringVectorSubExpression : VectorSubExpression<string> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.StringVectorStack);
+    public StringVectorSubExpression() { }
+    [StorableConstructor]
+    protected StringVectorSubExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter, interpreter.StringVectorStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.StringVectorStack);
     }
   }