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

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

@@ -4 +4 @@
 
   using Attributes;
+
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+
   using Interpreter;
   using Stack;
 
+  [StorableClass]
   public abstract class ShoveExpression<T> : StatelessExpression {
-    protected bool Eval(IPushStack<T> stack, IPushStack<long> integerStack) {
-      if ((stack == integerStack && integerStack.Count < 3) ||
-          (stack != integerStack && (integerStack.IsEmpty || stack.Count < 2)))
-        return false;
-
+    protected ShoveExpression() { }
+    [StorableConstructor]
+    protected ShoveExpression(bool deserializing) : base(deserializing) { }
+
+    protected void Eval(IPushStack<T> stack, IPushStack<long> integerStack) {
       var index = (int)Math.Abs(integerStack.Pop() % stack.Count);
       var item = stack.Pop();
       stack.Insert(index, item);
-      return true;
     }
   }
 
   [PushExpression(StackTypes.Integer, "INTEGER.SHOVE")]
+  [StorableClass]
   public class IntegerShoveExpression : ShoveExpression<long> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.IntegerStack, interpreter.IntegerStack);
+    public IntegerShoveExpression() { }
+    [StorableConstructor]
+    protected IntegerShoveExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.Count < 3;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.IntegerStack, interpreter.IntegerStack);
     }
   }
 
   [PushExpression(StackTypes.Float, "FLOAT.SHOVE", StackTypes.Integer)]
+  [StorableClass]
   public class FloatShoveExpression : ShoveExpression<double> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.FloatStack, interpreter.IntegerStack);
+    public FloatShoveExpression() { }
+    [StorableConstructor]
+    protected FloatShoveExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.IsEmpty || interpreter.FloatStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.FloatStack, interpreter.IntegerStack);
     }
   }
 
   [PushExpression(StackTypes.Boolean, "BOOLEAN.SHOVE", StackTypes.Integer)]
+  [StorableClass]
   public class BooleanShoveExpression : ShoveExpression<bool> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.BooleanStack, interpreter.IntegerStack);
+    public BooleanShoveExpression() { }
+    [StorableConstructor]
+    protected BooleanShoveExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.IsEmpty || interpreter.BooleanStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.BooleanStack, interpreter.IntegerStack);
     }
   }
 
   [PushExpression(StackTypes.Name, "NAME.SHOVE", StackTypes.Integer)]
+  [StorableClass]
   public class NameShoveExpression : ShoveExpression<string> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.NameStack, interpreter.IntegerStack);
+    public NameShoveExpression() { }
+    [StorableConstructor]
+    protected NameShoveExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.IsEmpty || interpreter.NameStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.NameStack, interpreter.IntegerStack);
     }
   }
 
   [PushExpression(StackTypes.Exec, "EXEC.SHOVE", StackTypes.Integer)]
+  [StorableClass]
   public class ExecShoveExpression : ShoveExpression<Expression> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.ExecStack, interpreter.IntegerStack);
+    public ExecShoveExpression() { }
+    [StorableConstructor]
+    protected ExecShoveExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.IsEmpty || interpreter.ExecStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.ExecStack, interpreter.IntegerStack);
     }
   }
 
   [PushExpression(StackTypes.Code, "CODE.SHOVE", StackTypes.Integer)]
+  [StorableClass]
   public class CodeShoveExpression : ShoveExpression<Expression> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.CodeStack, interpreter.IntegerStack);
+    public CodeShoveExpression() { }
+    [StorableConstructor]
+    protected CodeShoveExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.IsEmpty || interpreter.CodeStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.CodeStack, interpreter.IntegerStack);
     }
   }
 
   [PushExpression(StackTypes.Char, "CHAR.SHOVE", StackTypes.Integer)]
+  [StorableClass]
   public class CharShoveExpression : ShoveExpression<char> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.CharStack, interpreter.IntegerStack);
+    public CharShoveExpression() { }
+    [StorableConstructor]
+    protected CharShoveExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.IsEmpty || interpreter.CharStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.CharStack, interpreter.IntegerStack);
     }
   }
 
   [PushExpression(StackTypes.String, "STRING.SHOVE", StackTypes.Integer)]
+  [StorableClass]
   public class StringShoveExpression : ShoveExpression<string> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.StringStack, interpreter.IntegerStack);
+    public StringShoveExpression() { }
+    [StorableConstructor]
+    protected StringShoveExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.IsEmpty || interpreter.StringStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.StringStack, interpreter.IntegerStack);
     }
   }
 
   [PushExpression(StackTypes.IntegerVector, "INTEGER[].SHOVE", StackTypes.Integer)]
+  [StorableClass]
   public class IntegerVectorShoveExpression : ShoveExpression<List<long>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.IntegerVectorStack, interpreter.IntegerStack);
+    public IntegerVectorShoveExpression() { }
+    [StorableConstructor]
+    protected IntegerVectorShoveExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.IsEmpty || interpreter.IntegerVectorStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.IntegerVectorStack, interpreter.IntegerStack);
     }
   }
 
   [PushExpression(StackTypes.FloatVector, "FLOAT[].SHOVE", StackTypes.Integer)]
+  [StorableClass]
   public class FloatVectorShoveExpression : ShoveExpression<List<double>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.FloatVectorStack, interpreter.IntegerStack);
+    public FloatVectorShoveExpression() { }
+    [StorableConstructor]
+    protected FloatVectorShoveExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.IsEmpty || interpreter.FloatVectorStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.FloatVectorStack, interpreter.IntegerStack);
     }
   }
 
   [PushExpression(StackTypes.BooleanVector, "BOOLEAN[].SHOVE", StackTypes.Integer)]
+  [StorableClass]
   public class BooleanVectorShoveExpression : ShoveExpression<List<bool>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.BooleanVectorStack, interpreter.IntegerStack);
+    public BooleanVectorShoveExpression() { }
+    [StorableConstructor]
+    protected BooleanVectorShoveExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.IsEmpty || interpreter.BooleanVectorStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.BooleanVectorStack, interpreter.IntegerStack);
     }
   }
 
   [PushExpression(StackTypes.StringVector, "STRING[].SHOVE", StackTypes.Integer)]
+  [StorableClass]
   public class StringVectorShoveExpression : ShoveExpression<List<string>> {
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter.StringVectorStack, interpreter.IntegerStack);
+    public StringVectorShoveExpression() { }
+    [StorableConstructor]
+    protected StringVectorShoveExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return interpreter.IntegerStack.IsEmpty || interpreter.StringVectorStack.Count < 2;
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter.StringVectorStack, interpreter.IntegerStack);
     }
   }