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

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

@@ -3 +3 @@
 
   using Attributes;
+
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+
   using Interpreter;
   using Stack;
 
   [Serializable]
+  [StorableClass]
   public abstract class DoRangeExpression : LoopExpression {
     protected DoRangeExpression() { }
     protected DoRangeExpression(LoopState state) : base(state) { }
+    [StorableConstructor]
+    protected DoRangeExpression(bool deserializing) : base(deserializing) { }
+
     protected override bool HasInsufficientArguments(IInternalPushInterpreter interpreter, IPushStack<Expression> sourceStack) {
       return interpreter.IntegerStack.Count < 2 ||
@@ -51 +58 @@
   /// </summary>
   [Serializable]
+  [StorableClass]
   [PushExpression(StackTypes.Code, "CODE.DO*RANGE", StackTypes.Integer)]
   public class CodeDoRangeExpression : DoRangeExpression {
     public CodeDoRangeExpression() { }
+    public CodeDoRangeExpression(LoopState state) : base(state) { }
+    [StorableConstructor]
+    protected CodeDoRangeExpression(bool deserializing) : base(deserializing) { }
 
-    public CodeDoRangeExpression(LoopState state) : base(state) { }
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.CodeStack);
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return State.Body == null && HasInsufficientArguments(interpreter, interpreter.CodeStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.CodeStack);
     }
 
@@ -93 +107 @@
   /// </summary>
   [Serializable]
+  [StorableClass]
   [PushExpression(StackTypes.Exec, "EXEC.DO*RANGE", StackTypes.Integer)]
   public class ExecDoRangeExpression : DoRangeExpression {
@@ -98 +113 @@
 
     public ExecDoRangeExpression(LoopState state) : base(state) { }
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.ExecStack);
+    [StorableConstructor]
+    protected ExecDoRangeExpression(bool deserializing) : base(deserializing) { }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return State.Body == null && HasInsufficientArguments(interpreter, interpreter.ExecStack);
+    }
+
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.ExecStack);
     }
     protected override LoopExpression Clone(LoopState state, IInternalPushInterpreter interpreter) {