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

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

@@ -2 +2 @@
   using System;
 
+  using HeuristicLab.Common;
+  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Attributes;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
@@ -8 +10 @@
 
   [Serializable]
-  public class LoopState : IPooledObject {
+  [StorableClass]
+  public class LoopState : IDeepCloneable, IPooledObject {
     public static LoopState Create(
       IManagedPool<LoopState> pool,
@@ -25 +28 @@
     }
 
+    public LoopState() { }
+
+    [StorableConstructor]
+    protected LoopState(bool deserializing) { }
+    protected LoopState(LoopState origin, Cloner cloner) {
+      Body = origin.Body;
+      CurrentIndex = origin.CurrentIndex;
+      DestinationIndex = origin.DestinationIndex;
+      Incrementor = origin.Incrementor;
+    }
+
     public Expression Body { get; private set; }
     public long CurrentIndex { get; private set; }
@@ -35 +49 @@
       return hashCode.Value;
     }
+
+
 
     public void Reset() {
@@ -55 +71 @@
       return hash;
     }
+
+    public object Clone() {
+      return Clone(new Cloner());
+    }
+
+    public IDeepCloneable Clone(Cloner cloner) {
+      return new LoopState(this, cloner);
+    }
   }
 
   [Serializable]
+  [StorableClass]
   public abstract class LoopExpression : StatefulExpression<LoopState> {
     protected LoopExpression() : base(new LoopState()) { }
     protected LoopExpression(LoopState state) : base(state) { }
+    [StorableConstructor]
+    protected LoopExpression(bool deserializing) : base(deserializing) { }
 
-    protected bool Eval(IInternalPushInterpreter interpreter, IPushStack<Expression> sourceStack, bool pushCurrentIndex = false) {
+    protected void Eval(IInternalPushInterpreter interpreter, IPushStack<Expression> sourceStack, bool pushCurrentIndex = false) {
       // if not initialized
       if (State.Body == null) {
-        if (HasInsufficientArguments(interpreter, sourceStack)) return false;
+        if (HasInsufficientArguments(interpreter, sourceStack)) return;
 
         var state = InitState(interpreter, sourceStack);
@@ -71 +98 @@
 
         interpreter.ExecStack.Push(initLoopExpression, state.Body);
-        return true;
+        return;
       }
 
@@ -77 +104 @@
       if (State.DestinationIndex == State.CurrentIndex) {
         PushLastIteration(interpreter);
-        return true;
+        return;
       }
 
       PushIteration(interpreter);
-
-      return true;
     }