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

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

@@ -2 +2 @@
   using System;
 
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Interpreter;
@@ -7 +8 @@
 
   [Serializable]
+  [StorableClass]
   public abstract class DoCountExpression : LoopExpression {
 
     protected DoCountExpression() { }
     protected DoCountExpression(LoopState state) : base(state) { }
+    [StorableConstructor]
+    protected DoCountExpression(bool deserializing) : base(deserializing) { }
     protected override bool HasInsufficientArguments(IInternalPushInterpreter interpreter, IPushStack<Expression> sourceStack) {
       return interpreter.IntegerStack.Count < 1 ||
@@ -44 +48 @@
   /// </summary>
   [Serializable]
+  [StorableClass]
   [PushExpression(StackTypes.Code, "CODE.DO*COUNT", StackTypes.Integer)]
   public class CodeDoCountExpression : DoCountExpression {
 
     public CodeDoCountExpression() { }
+    public CodeDoCountExpression(LoopState state) : base(state) { }
+    [StorableConstructor]
+    protected CodeDoCountExpression(bool deserializing) : base(deserializing) { }
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return State.Body == null && HasInsufficientArguments(interpreter, interpreter.CodeStack);
+    }
 
-    public CodeDoCountExpression(LoopState state) : base(state) { }
-
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.CodeStack);
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.CodeStack);
     }
 
@@ -78 +87 @@
   /// </summary>
   [Serializable]
+  [StorableClass]
   [PushExpression(StackTypes.Exec, "EXEC.DO*COUNT", StackTypes.Integer)]
   public class ExecDoCountExpression : DoCountExpression {
     public ExecDoCountExpression() { }
     public ExecDoCountExpression(LoopState state) : base(state) { }
+    [StorableConstructor]
+    protected ExecDoCountExpression(bool deserializing) : base(deserializing) { }
 
-    public override bool Eval(IInternalPushInterpreter interpreter) {
-      return Eval(interpreter, interpreter.ExecStack);
+    public override void Eval(IInternalPushInterpreter interpreter) {
+      Eval(interpreter, interpreter.ExecStack);
+    }
+
+    public override bool IsNoop(IInternalPushInterpreter interpreter) {
+      return State.Body == null && HasInsufficientArguments(interpreter, interpreter.ExecStack);
     }