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

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

@@ -3 +3 @@
   using System.Collections.Generic;
   using Attributes;
+
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+
   using Interpreter;
   using Stack;
@@ -11 +14 @@
   /// </summary>
   /// <typeparam name="T">Stacktype</typeparam>
+  [StorableClass]
   public abstract class YankDuplicateExpression<T> : StatelessExpression {
-    public bool Eval(IPushStack<T> stack, IPushStack<long> integerStack) {
-      if ((stack == integerStack && integerStack.Count < 2) ||
-          (stack != integerStack && (integerStack.IsEmpty || stack.IsEmpty)))
-        return false;
-
+    protected YankDuplicateExpression() { }
+    [StorableConstructor]
+    protected YankDuplicateExpression(bool deserializing) : base(deserializing) { }
+
+    protected bool IsNoop(IPushStack<T> stack, IPushStack<long> integerStack) {
+      return (stack == integerStack && integerStack.Count < 3) ||
+             (stack != integerStack && (integerStack.IsEmpty || stack.Count < 2));
+    }
+
+    protected void Eval(IPushStack<T> stack, IPushStack<long> integerStack) {
       var index = (int)Math.Abs(integerStack.Pop() % stack.Count);
       stack.Push(stack[index]);
-      return true;
-    }
-  }
-
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Integer, "INTEGER.YANKDUP")]
   public class IntegerYankDuplicateExpression : YankDuplicateExpression<long> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.IntegerStack, interpreter.IntegerStack);
-    }
-  }
-
+    public IntegerYankDuplicateExpression() { }
+    [StorableConstructor]
+    protected IntegerYankDuplicateExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.IntegerStack, interpreter.IntegerStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.IntegerStack, interpreter.IntegerStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Float, "FLOAT.YANKDUP", StackTypes.Integer)]
   public class FloatYankDuplicateExpression : YankDuplicateExpression<double> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.FloatStack, interpreter.IntegerStack);
-    }
-  }
-
+    public FloatYankDuplicateExpression() { }
+    [StorableConstructor]
+    protected FloatYankDuplicateExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.FloatStack, interpreter.IntegerStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.FloatStack, interpreter.IntegerStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Boolean, "BOOLEAN.YANKDUP", StackTypes.Integer)]
   public class BooleanYankDuplicateExpression : YankDuplicateExpression<bool> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.BooleanStack, interpreter.IntegerStack);
-    }
-  }
-
+    public BooleanYankDuplicateExpression() { }
+    [StorableConstructor]
+    protected BooleanYankDuplicateExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.BooleanStack, interpreter.IntegerStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.BooleanStack, interpreter.IntegerStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Name, "NAME.YANKDUP", StackTypes.Integer)]
   public class NameYankDuplicateExpression : YankDuplicateExpression<string> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.NameStack, interpreter.IntegerStack);
-    }
-  }
-
+    public NameYankDuplicateExpression() { }
+    [StorableConstructor]
+    protected NameYankDuplicateExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.NameStack, interpreter.IntegerStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.NameStack, interpreter.IntegerStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Exec, "EXEC.YANKDUP", StackTypes.Integer)]
   public class ExecYankDuplicateExpression : YankDuplicateExpression<Expression> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.ExecStack, interpreter.IntegerStack);
-    }
-  }
-
+    public ExecYankDuplicateExpression() { }
+    [StorableConstructor]
+    protected ExecYankDuplicateExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.ExecStack, interpreter.IntegerStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.ExecStack, interpreter.IntegerStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Code, "CODE.YANKDUP", StackTypes.Integer)]
   public class CodeYankDuplicateExpression : YankDuplicateExpression<Expression> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.CodeStack, interpreter.IntegerStack);
-    }
-  }
-
+    public CodeYankDuplicateExpression() { }
+    [StorableConstructor]
+    protected CodeYankDuplicateExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.CodeStack, interpreter.IntegerStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.CodeStack, interpreter.IntegerStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.Char, "CHAR.YANKDUP", StackTypes.Integer)]
   public class CharYankDuplicateExpression : YankDuplicateExpression<char> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.CharStack, interpreter.IntegerStack);
-    }
-  }
-
+    public CharYankDuplicateExpression() { }
+    [StorableConstructor]
+    protected CharYankDuplicateExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.CharStack, interpreter.IntegerStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.CharStack, interpreter.IntegerStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.String, "STRING.YANKDUP", StackTypes.Integer)]
   public class StringYankDuplicateExpression : YankDuplicateExpression<string> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.StringStack, interpreter.IntegerStack);
-    }
-  }
-
+    public StringYankDuplicateExpression() { }
+    [StorableConstructor]
+    protected StringYankDuplicateExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.StringStack, interpreter.IntegerStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.StringStack, interpreter.IntegerStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.IntegerVector, "INTEGER[].YANKDUP", StackTypes.Integer)]
   public class IntegerVectorYankDuplicateExpression : YankDuplicateExpression<List<long>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.IntegerVectorStack, interpreter.IntegerStack);
-    }
-  }
-
+    public IntegerVectorYankDuplicateExpression() { }
+    [StorableConstructor]
+    protected IntegerVectorYankDuplicateExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.IntegerVectorStack, interpreter.IntegerStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.IntegerVectorStack, interpreter.IntegerStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.FloatVector, "FLOAT[].YANKDUP", StackTypes.Integer)]
   public class FloatVectorYankDuplicateExpression : YankDuplicateExpression<List<double>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.FloatVectorStack, interpreter.IntegerStack);
-    }
-  }
-
+    public FloatVectorYankDuplicateExpression() { }
+    [StorableConstructor]
+    protected FloatVectorYankDuplicateExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.FloatVectorStack, interpreter.IntegerStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.FloatVectorStack, interpreter.IntegerStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].YANKDUP", StackTypes.Integer)]
   public class BooleanVectorYankDuplicateExpression : YankDuplicateExpression<List<bool>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.BooleanVectorStack, interpreter.IntegerStack);
-    }
-  }
-
+    public BooleanVectorYankDuplicateExpression() { }
+    [StorableConstructor]
+    protected BooleanVectorYankDuplicateExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.BooleanVectorStack, interpreter.IntegerStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.BooleanVectorStack, interpreter.IntegerStack);
+    }
+  }
+
+  [StorableClass]
   [PushExpression(StackTypes.StringVector, "STRING[].YANKDUP", StackTypes.Integer)]
   public class StringVectorYankDuplicateExpression : YankDuplicateExpression<List<string>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.StringVectorStack, interpreter.IntegerStack);
+    public StringVectorYankDuplicateExpression() { }
+    [StorableConstructor]
+    protected StringVectorYankDuplicateExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return IsNoop(interpreter.StringVectorStack, interpreter.IntegerStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.StringVectorStack, interpreter.IntegerStack);
     }
   }