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

Timestamp:

05/03/17 01:31:10 (8 years ago)

Author:

pkimmesw

Message:

#2665 Fixed VectorExpression errors, Fixed BenchmarkSuite Problem Data View issues

File:

• branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Views/ViewHelper.cs (modified) (6 diffs)

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

@@ -1 +1 @@
 namespace HeuristicLab.BenchmarkSuite.Views {
+  using System.Linq;
+
   public static class ViewHelper {
     public static string StringifyInput(ExampleArgumentType type, Example example, string valueSeparator) {
       switch (type) {
         case ExampleArgumentType.Integer: return string.Join(valueSeparator, example.InputInteger);
-        //case ExampleArgumentType.IntegerVector: return string.Join(valueSeparator, example.InputInteger);
+        case ExampleArgumentType.IntegerVector: return "[" + string.Join("], [", example.InputIntegerVector.Select(vector => string.Join(valueSeparator, vector))) + "]";
 
         case ExampleArgumentType.Float: return string.Join(valueSeparator, example.InputFloat);
-        //case ExampleArgumentType.FloatVector: return string.Join(valueSeparator, example.InputFloat);
+        case ExampleArgumentType.FloatVector: return "[" + string.Join("], [", example.InputFloatVector.Select(vector => string.Join(valueSeparator, vector))) + "]";
 
         case ExampleArgumentType.Boolean: return string.Join(valueSeparator, example.InputBoolean);
@@ -13 +15 @@
 
         case ExampleArgumentType.String: return string.Join(valueSeparator, example.InputString);
-        //case ExampleArgumentType.StringVector: return string.Join(valueSeparator, example.InputString);
+        case ExampleArgumentType.StringVector: return "[" + string.Join("], [", example.InputStringVector.Select(vector => string.Join(valueSeparator, vector))) + "]";
         default: return string.Empty;
       }
@@ -21 +23 @@
       switch (type) {
         case ExampleArgumentType.Integer: return string.Join(valueSeparator, example.OutputInteger);
-        //case ExampleArgumentType.IntegerVector: return string.Join(valueSeparator, example.OutputIntegerVector);
+        case ExampleArgumentType.IntegerVector: return "[" + string.Join("], [", example.OutputIntegerVector.Select(vector => string.Join(valueSeparator, vector))) + "]";
 
         case ExampleArgumentType.Float: return string.Join(valueSeparator, example.OutputFloat);
-        //case ExampleArgumentType.FloatVector: return string.Join(valueSeparator, example.OutputFloat);
+        case ExampleArgumentType.FloatVector: return "[" + string.Join("], [", example.OutputFloatVector.Select(vector => string.Join(valueSeparator, vector))) + "]";
 
         case ExampleArgumentType.Boolean: return string.Join(valueSeparator, example.OutputBoolean);
@@ -30 +32 @@
 
         case ExampleArgumentType.String: return string.Join(valueSeparator, example.OutputString);
-        //case ExampleArgumentType.StringVector: return string.Join(valueSeparator, example.OutputString);
+        case ExampleArgumentType.Print: return string.Join(valueSeparator, example.OutputPrint);
+        case ExampleArgumentType.StringVector: return "[" + string.Join("], [", example.OutputStringVector.Select(vector => string.Join(valueSeparator, vector))) + "]";
+
         default: return string.Empty;
       }
@@ -42 +46 @@
     private const string CharColumnHeader = "char";
     private const string StringColumnHeader = "string";
+    private const string PrintColumnHeader = "print";
     private const string StringsColumnHeader = "string[]";
     public static string GetHeaderTypeName(ExampleArgumentType type) {
@@ -50 +55 @@
         case ExampleArgumentType.Char: return CharColumnHeader;
         case ExampleArgumentType.String: return StringColumnHeader;
+        case ExampleArgumentType.Print: return PrintColumnHeader;
         case ExampleArgumentType.IntegerVector: return IntegersColumnHeader;
         case ExampleArgumentType.FloatVector: return DoublesColumnHeader;