Changeset 15032 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/BenchmarkSuite

Timestamp:

06/12/17 14:11:43 (7 years ago)

Author:

pkimmesw

Message:

#2665 Fixed bias 0 issue, PushExpressionFrequencyAnalyzer, Fixed probability for ERC settings, Fixed enable/disable instructions, Added expression descriptions

Location:

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/BenchmarkSuite

Files:

• BenchmarkSuitePushSolutionView.cs (modified) (7 diffs)
• PushBenchmarkSuiteProblem.cs (modified) (2 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/BenchmarkSuite/BenchmarkSuitePushSolutionView.cs

@@ -120 +120 @@
           AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,
           CellTemplate = cellTemplate,
-          DefaultCellStyle = { Alignment = DataGridViewContentAlignment.MiddleRight }
+          DefaultCellStyle = { Alignment = DataGridViewContentAlignment.MiddleRight },
+          SortMode = DataGridViewColumnSortMode.Automatic
         };
 
@@ -133 +134 @@
           AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,
           CellTemplate = cellTemplate,
+          SortMode = DataGridViewColumnSortMode.Automatic
         };
 
@@ -138 +140 @@
           HeaderText = string.Format(OutputHeaderStringFormat, i + 1, headerTypeName),
           AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill,
-          CellTemplate = cellTemplate
+          CellTemplate = cellTemplate,
+          SortMode = DataGridViewColumnSortMode.Automatic
         };
 
@@ -151 +154 @@
         HeaderText = AbsoluteDiffHeaderText,
         AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,
-        CellTemplate = cellTemplate
+        CellTemplate = cellTemplate,
+        SortMode = DataGridViewColumnSortMode.Automatic
       };
 
@@ -158 +162 @@
         AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader,
         CellTemplate = cellTemplate,
+        SortMode = DataGridViewColumnSortMode.Automatic
       };
 
@@ -185 +190 @@
             var type = data.InputArgumentTypes[j];
             var offset = inputArgumentCountDict[type];
-            row.Cells[j].Value = ViewHelper.StringifyInput(type, offset, example, Separator);
+            row.Cells[j].Value = ViewHelper.StringifyInput(type, offset, Content.Config.FloatStringFormat, example, Separator);
             inputArgumentCountDict[type]++;
           }
@@ -193 +198 @@
             var type = data.OutputArgumentTypes[j];
             var offset = outputArgumentCountDict[type];
-            row.Cells[data.InputArgumentTypes.Length + j * 2].Value = ViewHelper.StringifyOutput(type, offset, example, Separator);
+            row.Cells[data.InputArgumentTypes.Length + j * 2].Value = ViewHelper.StringifyOutput(type, offset, Content.Config.FloatStringFormat, example, Separator);
             row.Cells[data.InputArgumentTypes.Length + j * 2 + 1].Value = StringifyResult(type, offset, pushInterpreter, example, Separator);
             outputArgumentCountDict[type]++;

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problems.ProgramSynthesis/Push/Problem/BenchmarkSuite/PushBenchmarkSuiteProblem.cs

@@ -5 +5 @@
 
   using HeuristicLab.BenchmarkSuite;
+  using HeuristicLab.BenchmarkSuite.Problems;
   using HeuristicLab.Problems.ProgramSynthesis.Push.Expressions;
 
@@ -18 +19 @@
       Parameters.Add(PushEvaluator.DataParameter);
       Parameters.Add(PushEvaluator.DataBoundsParameter);
+
+      if (PushEvaluator.Data == null) {
+        var defaultProblem = new NumberIO();
+        Load(defaultProblem.CreateProblemData());
+      }
     }