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

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

@@ -2 +2 @@
 
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
+  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 VectorContainsExpression<T> : StatelessExpression {
-    protected bool Eval(IInternalPushInterpreter interpreter, IPushStack<List<T>> vectorStack, IPushStack<T> literalStack, bool canOverride = false) {
-      if (vectorStack.IsEmpty || literalStack.IsEmpty)
-        return false;
+    protected VectorContainsExpression() { }
+    [StorableConstructor]
+    protected VectorContainsExpression(bool deserializing) : base(deserializing) { }
 
+    protected bool IsNoop(IPushStack<List<T>> vectorStack, IPushStack<T> literalStack) {
+      return vectorStack.IsEmpty || literalStack.IsEmpty;
+    }
+
+    protected void Eval(IInternalPushInterpreter interpreter, IPushStack<List<T>> vectorStack, IPushStack<T> literalStack, bool canOverride = false) {
       var vector = vectorStack.Pop();
       var literal = canOverride ? literalStack.Top : literalStack.Pop();
@@ -21 +28 @@
       if (canOverride) interpreter.BooleanStack.SetTop(contains);
       else interpreter.BooleanStack.Push(contains);
-      return true;
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.IntegerVector, "INTEGER[].CONTAINS", StackTypes.Integer | StackTypes.Boolean)]
   public class IntegerVectorContainsExpression : VectorContainsExpression<long> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.IntegerVectorStack, interpreter.IntegerStack);
+    public IntegerVectorContainsExpression() { }
+    [StorableConstructor]
+    protected IntegerVectorContainsExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.IntegerVectorStack, interpreter.IntegerStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.IntegerVectorStack, interpreter.IntegerStack);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.FloatVector, "FLOAT[].CONTAINS", StackTypes.Float | StackTypes.Boolean)]
   public class FloatVectorContainsExpression : VectorContainsExpression<double> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.FloatVectorStack, interpreter.FloatStack);
+    public FloatVectorContainsExpression() { }
+    [StorableConstructor]
+    protected FloatVectorContainsExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.FloatVectorStack, interpreter.FloatStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.FloatVectorStack, interpreter.FloatStack);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].CONTAINS", StackTypes.Boolean)]
   public class BooleanVectorContainsExpression : VectorContainsExpression<bool> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.BooleanVectorStack, interpreter.BooleanStack, true);
+    public BooleanVectorContainsExpression() { }
+    [StorableConstructor]
+    protected BooleanVectorContainsExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.BooleanVectorStack, interpreter.BooleanStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.BooleanVectorStack, interpreter.BooleanStack, true);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.StringVector, "STRING[].CONTAINS", StackTypes.String | StackTypes.Boolean)]
   public class StringVectorContainsExpression : VectorContainsExpression<string> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.StringVectorStack, interpreter.StringStack);
+    public StringVectorContainsExpression() { }
+    [StorableConstructor]
+    protected StringVectorContainsExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.StringVectorStack, interpreter.StringStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.StringVectorStack, interpreter.StringStack);
     }
   }