Changeset 14952 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Views/PushDebuggerView.cs

Timestamp:

05/10/17 11:23:05 (8 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/Views/PushDebuggerView.cs (modified) (10 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Views/PushDebuggerView.cs

@@ -18 +18 @@
 
     private PooledPushInterpreter interpreter;
-    private PooledPushInterpreter interpreter2; // used to determine noops
     private PushInterpreterPool pool;
 
-    private const string GroupBoxTextStringFormat = "{0}[{1}]";
+    private const string GROUP_BOX_TEXT_STRING_FORMAT = "{0}[{1}]";
+    private const string EXEC_COUNT_LABEL_FORMAT = "{0}/{1} max. expressions evaluated";
 
     public event EventHandler<IPushInterpreter> OnReset;
@@ -32 +32 @@
     ~PushDebuggerView() {
       interpreter.Dispose();
-      interpreter2.Dispose();
     }
 
@@ -52 +51 @@
       if (interpreter != null) {
         interpreter.Dispose();
-        interpreter2.Dispose();
       }
 
       interpreter = pool.Create(Content.Random);
-      interpreter2 = pool.Create(Content.Random);
-
 
       InitDebugLists(Content.Config);
@@ -66 +62 @@
     }
 
+    private void UpdateExecCountLabel() {
+      execCountLabel.Text = string.Format(
+        EXEC_COUNT_LABEL_FORMAT,
+        interpreter.ExecCounter,
+        Content.Config.EvalPushLimit);
+    }
+
     private void InitEvents() {
       runButton.Click += RunButtonClick;
@@ -78 +81 @@
 
       interpreter.Resume();
-
-      ResetDebugging();
+      UpdateStep();
+    }
+
+    private void StepButtonClick(object sender, EventArgs e) {
+      if (interpreter == null || stepWidthBox.Value <= 0)
+        return;
+
+      var count = Math.Min(stepWidthBox.Value, interpreter.ExecStack.Count);
+
+      for (var i = 0; i < count; i++) {
+        SkipNoops();
+
+        // run next none noop expression
+        interpreter.Step();
+      }
+
+      // skip trailing noops so next expression is a none noop in debugger
+      SkipNoops();
+
+      stepWidthBox.Maximum = Math.Max(1, interpreter.ExecStack.Count);
+      UpdateStep();
+    }
+
+    private void UpdateStep() {
       UpdateExecList();
       UpdateDebugLists();
+      UpdateExecCountLabel();
       CheckIfButtonsCanBeEnabled();
     }
 
-    private void StepButtonClick(object sender, EventArgs e) {
-      if (interpreter == null || stepWidthBox.Value <= 0)
-        return;
-
-      var count = Math.Min(stepWidthBox.Value, interpreter.ExecStack.Count);
-
-      if (!interpreter.CanStep)
-        return;
-
-      // skip leading noops
-      if (interpreter2.ExecCounter == (Content.Program.IsProgram ? 1 : 0) &&
-          skipNoopsCheckBox.Checked &&
-          SkipNoops()) {
-        count = 0; // no entries left, cause all were noops
-      }
-
-      for (var i = 0; i < count; i++) {
-        if (skipNoopsCheckBox.Checked) {
+    private void SkipNoops() {
+      // skip noops
+      if (skipNoopsCheckBox.Checked) {
+        while (interpreter.CanStep && interpreter.ExecStack.Top.IsNoop(interpreter)) {
           interpreter.Step();
-
-          if (SkipNoops())
-            break;
-        } else {
-          interpreter.Step();
-          interpreter2.Step();
         }
       }
-
-      stepWidthBox.Maximum = Math.Max(1, interpreter.ExecStack.Count);
-
-      UpdateExecList();
-      UpdateDebugLists();
-      CheckIfButtonsCanBeEnabled();
-    }
-
-    private bool SkipNoops() {
-      var skipCount = 0;
-      bool isNoop;
-
-      do {
-        skipCount++;
-        isNoop = !interpreter2.Step();
-      } while (interpreter2.CanStep && isNoop);
-
-      if (isNoop) {
-        interpreter.Step(skipCount);
-      } else if (skipCount > 1) {
-        interpreter.Step(skipCount - 1);
-      }
-
-      return isNoop;
     }
 
@@ -162 +144 @@
       if (interpreter != null) {
         interpreter.Reset();
-        interpreter2.Reset();
       }
 
       if (OnReset != null) {
         OnReset(this, interpreter);
-        OnReset(this, interpreter2);
       }
 
       interpreter.Run(Content.Program, true);
-      interpreter2.Run(Content.Program, true);
 
       stepWidthBox.Maximum = interpreter.ExecStack.Count;
-
-      UpdateDebugLists();
-      UpdateExecList();
-      CheckIfButtonsCanBeEnabled();
+      UpdateStep();
     }
 
@@ -194 +170 @@
 
       execList.Items.AddRange(expressions);
-      execGroupBox.Text = string.Format(GroupBoxTextStringFormat, Enum.GetName(typeof(StackTypes), StackTypes.Exec), interpreter.ExecStack.Count);
+      execGroupBox.Text = string.Format(GROUP_BOX_TEXT_STRING_FORMAT, Enum.GetName(typeof(StackTypes), StackTypes.Exec), interpreter.ExecStack.Count);
     }
 
@@ -224 +200 @@
 
       var list = new ListBox {
-        Dock = DockStyle.Fill,
-        DrawMode = DrawMode.OwnerDrawFixed
+        Dock = DockStyle.Fill
       };
 
@@ -232 +207 @@
       if (stackEntryType == typeof(double) ||
           stackEntryType == typeof(long)) {
+        list.DrawMode = DrawMode.OwnerDrawFixed;
         list.DrawItem += (sender, e) => {
           if (e.Index <= -1) return;
@@ -271 +247 @@
 
       foreach (var pair in debugControlDict) {
-        var stack = interpreter.Stacks[pair.Key];
         var name = Enum.GetName(typeof(StackTypes), pair.Key);
-
-        pair.Value.Items.AddRange(stack.AsObjects().Reverse().ToArray());
-        ((GroupBox)pair.Value.Parent).Text = string.Format(GroupBoxTextStringFormat, name, pair.Value.Items.Count);
+        var items = InterpreterStackStringifier.StringifyStack(interpreter, pair.Key).ToArray();
+
+        pair.Value.Items.AddRange(items);
+        ((GroupBox)pair.Value.Parent).Text = string.Format(GROUP_BOX_TEXT_STRING_FORMAT, name, pair.Value.Items.Count);
       }
     }