Changeset 15032 for branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.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.Problem.ProgramSynthesis.BenchmarkSuite

Files:

• DataTypes.cs (modified) (1 diff)
• Problems/NumberIo.cs (modified) (2 diffs)
• Views/DataEditorView.cs (modified) (2 diffs)
• Views/ViewHelper.cs (modified) (2 diffs)

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/DataTypes.cs

@@ -3 +3 @@
 
   [Flags]
-  public enum DataTypes : ushort {
+  public enum DataTypes {
     None = 0x01, // Required to specify expression dependencies
     Integer = 0x02,

branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Problems/NumberIo.cs

@@ -24 +24 @@
         WorstResult = 400,
         InputArgumentTypes = new[] { ExampleArgumentType.Float, ExampleArgumentType.Integer },
-        OutputArgumentTypes = new[] { ExampleArgumentType.Print },
+        OutputArgumentTypes = new[] { ExampleArgumentType.Float },
         TrainingCount = 25,
         TestCount = 1000,
-        EnabledDataTypes = DataTypes.Integer | DataTypes.Float | DataTypes.Print,
+        EnabledDataTypes = DataTypes.Integer | DataTypes.Float, // | DataTypes.Print,
         EvalLimit = 200,
         MaxSize = 200,
@@ -47 +47 @@
         InputFloat = ExampleArgumentConverter.ConvertDoubles(input[0]),
         InputInteger = ExampleArgumentConverter.ConvertIntegers(input[1]),
-        //OutputFloat = new[] { estimedFloatValue },
-        OutputPrint = estimedFloatValue.ToString("R", CultureInfo.InvariantCulture),
+        OutputFloat = ExampleArgumentConverter.ConvertDoubles(output),
+        //OutputPrint = estimedFloatValue.ToString("R", CultureInfo.InvariantCulture),
       };
     }

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

@@ -188 +188 @@
           var type = Content.InputArgumentTypes[i];
           var offset = inputArgumentCountDict[type];
-          row.Cells[i].Value = ViewHelper.StringifyInput(type, offset, example, ValueSeparator);
+          row.Cells[i].Value = ViewHelper.StringifyInput(type, offset, "R", example, ValueSeparator);
           inputArgumentCountDict[type]++;
         }
@@ -196 +196 @@
           var type = Content.OutputArgumentTypes[i];
           var offset = outputArgumentCountDict[type];
-          row.Cells[Content.InputArgumentTypes.Length + i].Value = ViewHelper.StringifyOutput(type, offset, example, ValueSeparator);
+          row.Cells[Content.InputArgumentTypes.Length + i].Value = ViewHelper.StringifyOutput(type, offset, "R", example, ValueSeparator);
           outputArgumentCountDict[type]++;
         }

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

@@ -6 +6 @@
 
   public static class ViewHelper {
-    public static string StringifyInput(ExampleArgumentType type, int offset, Example example, string valueSeparator) {
+    public static string StringifyInput(ExampleArgumentType type, int offset, string floatFormat, Example example, string valueSeparator) {
       switch (type) {
         case ExampleArgumentType.Integer: return example.InputInteger[offset].ToString();
         case ExampleArgumentType.IntegerVector: return "[" + string.Join(", ", example.InputIntegerVector[offset]) + "]";
 
-        case ExampleArgumentType.Float: return example.InputFloat[offset].ToString(CultureInfo.CurrentUICulture);
-        case ExampleArgumentType.FloatVector: return "[" + string.Join(", ", example.InputFloatVector[offset]) + "]";
+        case ExampleArgumentType.Float: return example.InputFloat[offset].ToString(floatFormat, CultureInfo.CurrentUICulture);
+        case ExampleArgumentType.FloatVector: return "[" + string.Join(", ", example.InputFloatVector[offset].Select(x => x.ToString(floatFormat, CultureInfo.InvariantCulture))) + "]";
 
         case ExampleArgumentType.Boolean: return example.InputBoolean[offset].ToString();
@@ -24 +24 @@
     }
 
-    public static string StringifyOutput(ExampleArgumentType type, int offset, Example example, string valueSeparator) {
+    public static string StringifyOutput(ExampleArgumentType type, int offset, string floatFormat, Example example, string valueSeparator) {
       switch (type) {
         case ExampleArgumentType.Integer: return example.OutputInteger[offset].ToString();
         case ExampleArgumentType.IntegerVector: return "[" + string.Join(", ", example.OutputIntegerVector[offset]) + "]";
 
-        case ExampleArgumentType.Float: return example.OutputFloat[offset].ToString(CultureInfo.CurrentUICulture);
-        case ExampleArgumentType.FloatVector: return "[" + string.Join(", ", example.OutputFloatVector[offset]) + "]";
+        case ExampleArgumentType.Float: return example.OutputFloat[offset].ToString(floatFormat, CultureInfo.InvariantCulture);
+        case ExampleArgumentType.FloatVector: return "[" + string.Join(", ", example.OutputFloatVector[offset].Select(x => x.ToString(floatFormat, CultureInfo.InvariantCulture))) + "]";
 
         case ExampleArgumentType.Boolean: return example.OutputBoolean[offset].ToString();