Changeset 14777 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/DoRangeExpressions.cs

Timestamp:

03/23/17 01:11:18 (8 years ago)

Author:

pkimmesw

Message:

#2665 simplifier, push solution results view, performance improvements, small bug fixes, ui fixes

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Expressions/DoRangeExpressions.cs (modified) (6 diffs)

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

@@ -1 +1 @@
 namespace HeuristicLab.Problems.ProgramSynthesis.Push.Expressions {
+  using System;
+
   using Attributes;
   using Interpreter;
   using Stack;
 
+  [Serializable]
   public abstract class DoRangeExpression : LoopExpression {
     protected DoRangeExpression() { }
@@ -17 +20 @@
       var incrementor = destinationIndex < interpreter.IntegerStack.Top ? -1 : 1;
 
-      return new LoopState(
+      return LoopState.Create(interpreter.PoolContainer.LoopStatePool,
           body: sourceStack.Pop(),
           currentIndex: interpreter.IntegerStack.Top + incrementor,
@@ -47 +50 @@
   ///     that is less than the specified current index.
   /// </summary>
-  [PushExpression(StackType.Code, "CODE.DO*RANGE")]
+  [Serializable]
+  [PushExpression(StackTypes.Code, "CODE.DO*RANGE", StackTypes.Integer)]
   public class CodeDoRangeExpression : DoRangeExpression {
     public CodeDoRangeExpression() { }
@@ -56 +60 @@
     }
 
-    protected override LoopExpression Clone(LoopState state) {
-      return new CodeDoRangeExpression(state);
+    protected override LoopExpression Clone(LoopState state, IPushInterpreter interpreter) {
+      var expression = interpreter.PoolContainer.GetStatefulExpression<CodeDoRangeExpression>();
+      expression.State = state;
+
+      return expression;
     }
   }
@@ -85 +92 @@
   ///     index that is less than the specified current index.
   /// </summary>
-  [PushExpression(StackType.Exec, "EXEC.DO*RANGE")]
+  [Serializable]
+  [PushExpression(StackTypes.Exec, "EXEC.DO*RANGE", StackTypes.Integer)]
   public class ExecDoRangeExpression : DoRangeExpression {
     public ExecDoRangeExpression() { }
@@ -93 +101 @@
       return this.Eval(interpreter, interpreter.ExecStack);
     }
-    protected override LoopExpression Clone(LoopState state) {
-      return new ExecDoRangeExpression(state);
+    protected override LoopExpression Clone(LoopState state, IPushInterpreter interpreter) {
+      var expression = interpreter.PoolContainer.GetStatefulExpression<ExecDoRangeExpression>();
+      expression.State = state;
+
+      return expression;
     }
   }