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

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/VectorSetExpressions.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 VectorSetExpression<T> : StatelessExpression {
-    protected bool Eval(
+    protected VectorSetExpression() { }
+    [StorableConstructor]
+    protected VectorSetExpression(bool deserializing) : base(deserializing) { }
+
+    protected bool IsNoop(IInternalPushInterpreter interpreter, IPushStack<List<T>> vectorStack, IPushStack<T> literalStack, bool isLiteralTypeInteger = false) {
+      return vectorStack.IsEmpty ||
+             vectorStack.Top.Count == 0 ||
+             literalStack.IsEmpty ||
+             (isLiteralTypeInteger && interpreter.IntegerStack.Count < 2) ||
+             (!isLiteralTypeInteger && interpreter.IntegerStack.IsEmpty);
+    }
+
+    protected void Eval(
       IInternalPushInterpreter interpreter,
       IPushStack<List<T>> vectorStack,
       IPushStack<T> literalStack,
       bool isLiteralTypeInteger = false) {
-      if (vectorStack.IsEmpty ||
-          vectorStack.Top.Count == 0 ||
-          literalStack.IsEmpty ||
-          (isLiteralTypeInteger && interpreter.IntegerStack.Count < 2) ||
-          (!isLiteralTypeInteger && interpreter.IntegerStack.IsEmpty))
-        return false;
-
       T literal;
       int index;
@@ -42 +49 @@
 
       vector[index] = literal;
-      return true;
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.IntegerVector, "INTEGER[].SET", StackTypes.Integer)]
   public class IntegerVectorSetExpression : VectorSetExpression<long> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.IntegerVectorStack, interpreter.IntegerStack, true);
+    public IntegerVectorSetExpression() { }
+    [StorableConstructor]
+    protected IntegerVectorSetExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter, interpreter.IntegerVectorStack, interpreter.IntegerStack, true);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.IntegerVectorStack, interpreter.IntegerStack, true);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.FloatVector, "FLOAT[].SET", StackTypes.Float | StackTypes.Integer)]
   public class FloatVectorSetExpression : VectorSetExpression<double> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.FloatVectorStack, interpreter.FloatStack);
+    public FloatVectorSetExpression() { }
+    [StorableConstructor]
+    protected FloatVectorSetExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter, interpreter.FloatVectorStack, interpreter.FloatStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.FloatVectorStack, interpreter.FloatStack);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].SET", StackTypes.Boolean | StackTypes.Integer)]
   public class BooleanVectorSetExpression : VectorSetExpression<bool> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.BooleanVectorStack, interpreter.BooleanStack);
+    public BooleanVectorSetExpression() { }
+    [StorableConstructor]
+    protected BooleanVectorSetExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter, interpreter.BooleanVectorStack, interpreter.BooleanStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.BooleanVectorStack, interpreter.BooleanStack);
     }
   }
 
+  [StorableClass]
   [PushExpression(StackTypes.StringVector, "STRING[].SET", StackTypes.String | StackTypes.Integer)]
   public class StringVectorSetExpression : VectorSetExpression<string> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.StringVectorStack, interpreter.StringStack);
+    public StringVectorSetExpression() { }
+    [StorableConstructor]
+    protected StringVectorSetExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter, interpreter.StringVectorStack, interpreter.StringStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.StringVectorStack, interpreter.StringStack);
     }
   }