Changeset 14875 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Views/PushProgramDebuggerView.cs

Timestamp:

04/18/17 01:15:25 (7 years ago)

Author:

pkimmesw

Message:

#2665 BenchmarkSuite, all examples, partially tested, VectorExpressions added

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Views/PushProgramDebuggerView.cs (modified) (13 diffs)

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

@@ -68 +68 @@
                          (IntegerVector)Content.IntegerVector.Clone(),
                          Content.Quality,
-                         (Data)Content.Data.Clone(),
+                         (ProblemData)Content.Data.Clone(),
                          (IRandom)Content.Random.Clone(),
                          Content.Config,
@@ -85 +85 @@
 
       UpdateExecList();
-      UpdateValueLists();
+      this.UpdateDebugLists();
       CheckIfButtonsCanBeEnabled();
     }
@@ -120 +120 @@
 
       UpdateExecList();
-      UpdateValueLists();
+      this.UpdateDebugLists();
       CheckIfButtonsCanBeEnabled();
     }
@@ -180 +180 @@
 
       interpreter.BooleanStack.Push(example.InputBoolean);
-      interpreter.IntegerStack.Push(example.InputInt);
+      interpreter.IntegerStack.Push(example.InputInteger);
       interpreter.FloatStack.Push(example.InputFloat);
 
       interpreter2.BooleanStack.Push(example.InputBoolean);
-      interpreter2.IntegerStack.Push(example.InputInt);
+      interpreter2.IntegerStack.Push(example.InputInteger);
       interpreter2.FloatStack.Push(example.InputFloat);
 
@@ -192 +192 @@
       stepWidthBox.Maximum = interpreter.ExecStack.Count;
 
-      UpdateValueLists();
+      this.UpdateDebugLists();
       UpdateExecList();
       CheckIfButtonsCanBeEnabled();
@@ -227 +227 @@
       InitDebugLists(Content.Config);
       InitResultGrid();
-      ClearLists();
+      this.ClearDebugLists();
       UpdateExecList();
-      UpdateValueLists();
+      this.UpdateDebugLists();
     }
 
@@ -320 +320 @@
       switch (type) {
         case ExampleArgumentType.Integer:
-        case ExampleArgumentType.IntegerCollection: return interpreter.IntegerStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.IntegerStack.Peek(GetCount(interpreter.IntegerStack, example.OutputInt)));
+        case ExampleArgumentType.IntegerVector: return interpreter.IntegerStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.IntegerStack.Peek(GetCount(interpreter.IntegerStack, example.OutputInteger)));
 
         case ExampleArgumentType.Float:
-        case ExampleArgumentType.FloatCollection: return interpreter.FloatStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.FloatStack.Peek(GetCount(interpreter.FloatStack, example.OutputFloat)).Select(d => d.ToString(CultureInfo.CurrentUICulture)));
-
-        case ExampleArgumentType.Bool: return interpreter.BooleanStack.IsEmpty ? EmptySign : interpreter.BooleanStack.Top.ToString();
+        case ExampleArgumentType.FloatVector: return interpreter.FloatStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.FloatStack.Peek(GetCount(interpreter.FloatStack, example.OutputFloat)).Select(d => d.ToString(CultureInfo.CurrentUICulture)));
+
+        case ExampleArgumentType.Boolean: return interpreter.BooleanStack.IsEmpty ? EmptySign : interpreter.BooleanStack.Top.ToString();
         case ExampleArgumentType.Char: return interpreter.CharStack.IsEmpty ? EmptySign : interpreter.CharStack.Top.ToString();
 
         case ExampleArgumentType.String:
-        case ExampleArgumentType.StringCollection: return interpreter.StringStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.StringStack.Peek(GetCount(interpreter.StringStack, example.OutputString)));
+        case ExampleArgumentType.StringVector: return interpreter.StringStack.IsEmpty ? EmptySign : string.Join(valueSeparator, interpreter.StringStack.Peek(GetCount(interpreter.StringStack, example.OutputString)));
         default: return string.Empty;
       }
@@ -338 +338 @@
     }
 
-    private void ClearLists() {
+    private void ClearDebugLists() {
       foreach (var list in debugControlDict.Values) {
         list.Items.Clear();
@@ -346 +346 @@
     private void UpdateExecList() {
       execList.Items.Clear();
-      var expressions = interpreter.ExecStack
+      var expressions = interpreter.ExecStack.AsEnumerable()
         .Reverse()
         .Select(e => e.StringRepresentation)
@@ -367 +367 @@
         if (stackType != StackTypes.Exec &&
             ExpressionTable.GetExpressionsByStackTypes(stackType).Intersect(config.EnabledExpressions).Any()) {
-          var list = GetDebugList(stackType);
+          var list = this.CreateDebugList(stackType);
           debugControlDict.Add(stackType, list);
         }
@@ -373 +373 @@
     }
 
-    private ListBox GetDebugList(StackTypes type) {
+    private ListBox CreateDebugList(StackTypes type) {
       var groupBox = new GroupBox {
         Anchor = AnchorStyles.Bottom | AnchorStyles.Right | AnchorStyles.Left | AnchorStyles.Top,
@@ -421 +421 @@
 
 
-    private void UpdateValueLists() {
-      ClearLists();
+    private void UpdateDebugLists() {
+      this.ClearDebugLists();
 
       if (Content == null || interpreter == null)
@@ -436 +436 @@
     }
 
-    private void UpdateExamples(Data data) {
+    private void UpdateExamples(ProblemData data) {
       exampleComboBox.Items.Clear();
       if (data == null) return;