Changeset 15341 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Interpreter

Timestamp:

08/28/17 09:03:34 (7 years ago)

Author:

pkimmesw

Message:

#2665 Testet Problems, Improved Performance

Location:

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

Files:

• PushInterpreter.cs (modified) (6 diffs)
• PushInterpreterPool.cs (modified) (1 diff)

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

@@ -17 +17 @@
   public class PushInterpreter : IInternalPushInterpreter, IDisposable {
     private Task currentTask;
-    private Expression currentProgram;
+    private int evalPushLimit;
 
     /// <summary>
@@ -30 +30 @@
       Configuration = config ?? new PushConfiguration();
 
-      // setting the capacity of the Stacks to max points ensures that there will be enough memory at runtime
       ExecStack = new PushStack<Expression>(Configuration.MaxProgramLength);
       CodeStack = new PushStack<Expression>();
@@ -66 +65 @@
       PoolContainer = poolContainer ?? new InterpreterPoolContainer();
 
+      InitEvalPushLimit();
       ConfigureStacks();
     }
@@ -92 +92 @@
                !IsPaused &&
                !IsAborted &&
-               (ExecCounter < Configuration.EvalPushLimit);
+               (ExecCounter < evalPushLimit);
       }
     }
@@ -261 +261 @@
     public void Run(Expression expression, bool stepwise = false) {
       IsPaused = stepwise;
-      currentProgram = expression;
 
       /* Push top expression so the loop is able to enter
@@ -347 +346 @@
       Random = (IRandom)randomOrigin.Clone();
 
+      InitEvalPushLimit();
+
       ExecCounter = 0;
       IsAborted = false;
       IsPaused = false;
       currentTask = null;
-      currentProgram = null;
 
       inputExpressions.Clear();
       ClearStacks();
       ConfigureStacks();
+    }
+
+    private void InitEvalPushLimit() {
+      // evalPushLimit is accessed very often and using the getter of the configuration object is rather expensive as the values is capsuled within a parameter
+      evalPushLimit = Configuration.EvalPushLimit;
+    }
+
+    private void EvalPushLimitChanged(object sender, EventArgs e) {
+      this.evalPushLimit = Configuration.EvalPushLimit;
     }
 

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

@@ -33 +33 @@
 
     public PooledPushInterpreter Create(IRandom random = null) {
-      //var interpreter = pool.Allocate();
-      //interpreter.Reset(random);
-
-      var poolContainer = new InterpreterPoolContainer(PushProgramPoolProvider, ExpressionListPoolProvider);
-      var interpreter = new PooledPushInterpreter(this, PushConfiguration, poolContainer, random);
+      var interpreter = pool.Allocate();
+      interpreter.Reset(random);
 
       return interpreter;