Changeset 14746 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/PushInterpreter.cs

Timestamp:

03/11/17 20:07:13 (7 years ago)

Author:

pkimmesw

Message:

#2665 PooledPushProgram reduces memory usage and increases performance

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/PushInterpreter.cs (modified) (4 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter/PushInterpreter.cs

@@ -2 +2 @@
   using System;
   using System.Collections.Generic;
+#if DEBUG
+  using System.Linq;
+#endif
   using System.Runtime.CompilerServices;
   using System.Threading;
@@ -7 +10 @@
   using HeuristicLab.Core;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Configuration;
+  using HeuristicLab.Problems.ProgramSynthesis.Push.Data.Pool;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Parser;
@@ -82 +86 @@
     }
 
+    public IManagedPool<PushProgram> PushProgramPool { get; set; }
+
     public IReadonlyPushConfiguration Configuration { get; protected set; }
 
@@ -249 +255 @@
     }
 
+#if DEBUG
+    private Expression last;
+    private bool DoStep() {
+      var expression = ExecStack.Pop();
+
+      if (ExecStack.Any(e => e == null)) {
+        throw new InvalidProgramException();
+      }
+
+      var succ = expression.Eval(this);
+      last = expression;
+
+      return succ;
+    }
+#else
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private bool DoStep() {
       return ExecStack.Pop().Eval(this);
     }
+#endif
 
     private Task InterpretAsync() {