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

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

@@ -192 +192 @@
 
       /* Push top expression so the loop is able to enter
-       * If the top expression is a single statement then the loop has nothing to do.
-       * Otherwise the expand expression will be evaluated and pushes code onto the EXEC stack.
-       * Expanding the initial program is not counted */
-      ExecStack.Push(expression);
-
-      if (Configuration.TopLevelPushCode) CodeStack.Push(expression);
-
-      // expand if program
-      if (expression.IsProgram)
-        DoStep();
+       * If the top expression is a single statement it gets evaluated in Run.
+       * Otherwise the push program will be evaluated and the expressions of the program are pushed onto the EXEC stack.
+       * Expanding the initial program is not counted in ExecCount */
+      InitRun(expression);
+
+      if (Configuration.TopLevelPushCode && CodeStack.IsEnabled)
+        CodeStack.Push(expression);
 
       Run();
@@ -309 +306 @@
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private void Finally() {
-      if (Configuration.TopLevelPopCode && !CodeStack.IsEmpty)
+      if (Configuration.TopLevelPopCode && !CodeStack.IsEmpty && CodeStack.IsEnabled)
         CodeStack.Pop();
 
       PoolContainer.DisposePools();
+    }
+
+    private void InitRun(Expression expression) {
+      ExecStack.Push(expression);
+
+      if (!expression.IsProgram)
+        return;
+
+      DoStep();
+      ExecCounter--;   // unpacking the initial program is not counted
     }
 
@@ -324 +331 @@
 
       var expression = ExecStack.Pop();
-      var succ = expression.Eval(this);
+      var succ = expression.TryEval(this);
 
       if ((ExecStack.Count > 0 && ExecStack.Top == null) ||
@@ -341 +348 @@
     private bool DoStep() {
       ExecCounter++;
-      return ExecStack.Pop().Eval(this);
+      return ExecStack.Pop().TryEval(this);
     }
 #endif
@@ -347 +354 @@
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private void DoTenSteps() {
-      ExecStack[0].Eval(this);
-      ExecStack[1].Eval(this);
-      ExecStack[2].Eval(this);
-      ExecStack[3].Eval(this);
-      ExecStack[4].Eval(this);
-      ExecStack[5].Eval(this);
-      ExecStack[6].Eval(this);
-      ExecStack[7].Eval(this);
-      ExecStack[8].Eval(this);
-      ExecStack[9].Eval(this);
+      ExecStack[0].TryEval(this);
+      ExecStack[1].TryEval(this);
+      ExecStack[2].TryEval(this);
+      ExecStack[3].TryEval(this);
+      ExecStack[4].TryEval(this);
+      ExecStack[5].TryEval(this);
+      ExecStack[6].TryEval(this);
+      ExecStack[7].TryEval(this);
+      ExecStack[8].TryEval(this);
+      ExecStack[9].TryEval(this);
 
       ExecStack.Remove(10);