Changeset 14777 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Views

Timestamp:

03/23/17 01:11:18 (7 years ago)

Author:

pkimmesw

Message:

#2665 simplifier, push solution results view, performance improvements, small bug fixes, ui fixes

Location:

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Views

Files:

• DataEditorView.Designer.cs (modified) (1 diff)
• DataEditorView.cs (modified) (7 diffs)
• ViewHelper.cs (added)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Views/DataEditorView.Designer.cs

@@ -33 +33 @@
       this.errorProvider.SetIconAlignment(this.nameTextBox, System.Windows.Forms.ErrorIconAlignment.MiddleLeft);
       this.errorProvider.SetIconPadding(this.nameTextBox, 2);
-      this.nameTextBox.Size = new System.Drawing.Size(302, 20);
+      this.nameTextBox.Size = new System.Drawing.Size(758, 20);
       //
       // infoLabel
       //
-      this.infoLabel.Location = new System.Drawing.Point(366, 3);
+      this.infoLabel.Location = new System.Drawing.Point(822, 3);
       //
       // dataGridView

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Views/DataEditorView.cs

@@ -2 +2 @@
 
 namespace HeuristicLab.BenchmarkSuite.Views {
+
+  using HeuristicLab.BenchmarkSuite.Problems;
   using HeuristicLab.Core.Views;
   using HeuristicLab.MainForm;
 
   [View("Push Expression Selection Editor")]
-  [Content(typeof(IBenchmarkSuiteDataDescriptor), true)]
+  [Content(typeof(Data), true)]
   public partial class DataEditorView : NamedItemView {
+    private const string ValueSeparator = ", ";
+
     public DataEditorView() {
       InitializeComponent();
@@ -20 +24 @@
       var row = dataGridView.Rows[e.RowIndex];
 
-      var inputArgs = new string[Content.InputArgumentCount];
-      for (var i = 0; i < Content.InputArgumentCount; i++) {
+      var inputArgs = new string[Content.InputArgumentTypes.Length];
+      for (var i = 0; i < Content.InputArgumentTypes.Length; i++) {
         inputArgs[i] = row.Cells[i].Value.ToString();
       }
 
-      var outputArgs = new string[Content.OutputArgumentCount];
-      for (var i = 0; i < Content.OutputArgumentCount; i++) {
-        outputArgs[i] = row.Cells[Content.InputArgumentCount + i].Value.ToString();
+      var outputArgs = new string[Content.OutputArgumentTypes.Length];
+      for (var i = 0; i < Content.OutputArgumentTypes.Length; i++) {
+        outputArgs[i] = row.Cells[Content.InputArgumentTypes.Length + i].Value.ToString();
       }
 
@@ -33 +37 @@
 
       try {
-        var newExample = Content.ParseExample(inputArgs, outputArgs);
+        var newExample = ParseExample(inputArgs, Content.InputArgumentTypes, outputArgs, Content.OutputArgumentTypes);
         newExample.CopyTo(example);
       }
@@ -40 +44 @@
 
         // reset entry
-        row.Cells[e.ColumnIndex].Value = e.ColumnIndex < Content.InputArgumentCount
+        row.Cells[e.ColumnIndex].Value = e.ColumnIndex < Content.InputArgumentTypes.Length
           ? example.InputArgs[e.ColumnIndex]
-          : example.OutputArgs[e.ColumnIndex - Content.InputArgumentCount];
+          : example.OutputArgs[e.ColumnIndex - Content.InputArgumentTypes.Length];
       }
     }
 
-    public new IBenchmarkSuiteDataDescriptor Content
+    private Example ParseExample(string[] inputArgs, ExampleArgumentType[] inputArgTypes, string[] outputArgs, ExampleArgumentType[] outputArgTypes) {
+      var example = new Example();
+
+      example.InputArgs = new string[inputArgs.Length];
+      for (var i = 0; i < inputArgs.Length; i++) {
+        var arg = inputArgs[i];
+        var type = inputArgTypes[i];
+
+        switch (type) {
+          case ExampleArgumentType.Bool:
+            example.InputBoolean = new[] { ExampleArgumentConverter.ConvertBoolean(arg) };
+            example.InputArgs[i] = arg;
+            break;
+          case ExampleArgumentType.Integer:
+            example.InputInt = new[] { ExampleArgumentConverter.ConvertInteger(arg) };
+            example.InputArgs[i] = arg;
+            break;
+          case ExampleArgumentType.IntegerCollection:
+            example.InputInt = ExampleArgumentConverter.ConvertIntegers(arg);
+            example.InputArgs[i] = string.Join(ValueSeparator, example.InputInt);
+            break;
+          case ExampleArgumentType.Float:
+            example.InputFloat = new[] { ExampleArgumentConverter.ConvertDouble(arg) };
+            example.InputArgs[i] = arg;
+            break;
+          case ExampleArgumentType.FloatCollection:
+            example.InputFloat = ExampleArgumentConverter.ConvertDoubles(arg);
+            example.InputArgs[i] = string.Join(ValueSeparator, example.InputFloat);
+            break;
+        }
+      }
+
+      example.OutputArgs = new string[outputArgs.Length];
+      for (var i = 0; i < outputArgs.Length; i++) {
+        var arg = outputArgs[i];
+        var type = outputArgTypes[i];
+
+        switch (type) {
+          case ExampleArgumentType.Bool:
+            example.OutputBoolean = new[] { ExampleArgumentConverter.ConvertBoolean(arg) };
+            example.OutputArgs[i] = arg;
+            break;
+          case ExampleArgumentType.Integer:
+            example.OutputInt = new[] { ExampleArgumentConverter.ConvertInteger(arg) };
+            example.OutputArgs[i] = arg;
+            break;
+          case ExampleArgumentType.IntegerCollection:
+            example.OutputInt = ExampleArgumentConverter.ConvertIntegers(arg);
+            example.OutputArgs[i] = string.Join(ValueSeparator, example.OutputInt);
+            break;
+          case ExampleArgumentType.Float:
+            example.OutputFloat = new[] { ExampleArgumentConverter.ConvertDouble(arg) };
+            example.OutputArgs[i] = arg;
+            break;
+          case ExampleArgumentType.FloatCollection:
+            example.OutputFloat = ExampleArgumentConverter.ConvertDoubles(arg);
+            example.OutputArgs[i] = string.Join(ValueSeparator, example.OutputFloat);
+            break;
+        }
+      }
+
+      return example;
+    }
+
+    public new Data Content
     {
-      get { return (IBenchmarkSuiteDataDescriptor)base.Content; }
+      get { return (Data)base.Content; }
       set
       {
@@ -69 +137 @@
       }
 
+      this.nameTextBox.Text = Content.Name;
+
       var cellTemplate = new DataGridViewTextBoxCell();
 
-      for (var i = 1; i <= Content.InputArgumentCount; i++) {
+      for (var i = 0; i < Content.InputArgumentTypes.Length; i++) {
+        var headerTypeName = ViewHelper.GetHeaderTypeName(Content.InputArgumentTypes[i]);
         var column = new DataGridViewColumn {
-          HeaderText = string.Format("Input {0}", i),
+          HeaderText = string.Format("Input {0} : {1}", i + 1, headerTypeName),
           AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,
           CellTemplate = cellTemplate
@@ -81 +152 @@
       }
 
-      for (var i = 1; i <= Content.OutputArgumentCount; i++) {
+      for (var i = 0; i < Content.OutputArgumentTypes.Length; i++) {
+        var headerTypeName = ViewHelper.GetHeaderTypeName(Content.OutputArgumentTypes[i]);
         var column = new DataGridViewColumn {
-          HeaderText = string.Format("Output {0}", i),
+          HeaderText = string.Format("Output {0} : {1}", i + 1, headerTypeName),
           AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,
           CellTemplate = cellTemplate
@@ -97 +169 @@
         row.CreateCells(dataGridView);
 
-        for (var i = 0; i < Content.InputArgumentCount; i++) {
-          row.Cells[i].Value = example.InputArgs[i];
+        for (var i = 0; i < Content.InputArgumentTypes.Length; i++) {
+          row.Cells[i].Value = ViewHelper.StringifyInput(Content.InputArgumentTypes[i], example, ValueSeparator);
         }
 
-        for (var i = 0; i < Content.OutputArgumentCount; i++) {
-          row.Cells[Content.InputArgumentCount + i].Value = example.OutputArgs[i];
+        for (var i = 0; i < Content.OutputArgumentTypes.Length; i++) {
+          row.Cells[Content.InputArgumentTypes.Length + i].Value = ViewHelper.StringifyOutput(Content.OutputArgumentTypes[i], example, ValueSeparator);
         }