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

Timestamp:

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

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/VectorIndexOfExpressions.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 VectorIndexOfExpression<T> : StatelessExpression {
-    protected bool Eval(
+    protected VectorIndexOfExpression() { }
+    [StorableConstructor]
+    protected VectorIndexOfExpression(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) {
-      if (vectorStack.IsEmpty || literalStack.IsEmpty)
-        return false;
-
       var vector = vectorStack.Pop();
       var literal = canOverride ? literalStack.Top : literalStack.Pop();
@@ -25 +32 @@
       if (canOverride) interpreter.IntegerStack.SetTop(result);
       else interpreter.IntegerStack.Push(result);
-      return true;
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.IntegerVector, "INTEGER[].INDEXOF", StackTypes.Integer)]
   public class IntegerVectorIndexOfExpression : VectorIndexOfExpression<long> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.IntegerVectorStack, interpreter.IntegerStack, true);
+    public IntegerVectorIndexOfExpression() { }
+    [StorableConstructor]
+    protected IntegerVectorIndexOfExpression(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, true);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.FloatVector, "FLOAT[].INDEXOF", StackTypes.Float | StackTypes.Integer)]
   public class FloatVectorIndexOfExpression : VectorIndexOfExpression<double> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.FloatVectorStack, interpreter.FloatStack);
+    public FloatVectorIndexOfExpression() { }
+    [StorableConstructor]
+    protected FloatVectorIndexOfExpression(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[].INDEXOF", StackTypes.Boolean | StackTypes.Integer)]
   public class BooleanVectorIndexOfExpression : VectorIndexOfExpression<bool> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.BooleanVectorStack, interpreter.BooleanStack);
+    public BooleanVectorIndexOfExpression() { }
+    [StorableConstructor]
+    protected BooleanVectorIndexOfExpression(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);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.StringVector, "STRING[].INDEXOF", StackTypes.String | StackTypes.String)]
   public class StringVectorIndexOfExpression : VectorIndexOfExpression<string> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.StringVectorStack, interpreter.StringStack);
+    public StringVectorIndexOfExpression() { }
+    [StorableConstructor]
+    protected StringVectorIndexOfExpression(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);
     }
   }