Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/18/17 01:15:25 (7 years ago)
Author:
pkimmesw
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r14834 r14875  
    44      switch (type) {
    55        case ExampleArgumentType.Integer:
    6         case ExampleArgumentType.IntegerCollection: return string.Join(valueSeparator, example.InputInt);
     6        case ExampleArgumentType.IntegerVector: return string.Join(valueSeparator, example.InputInteger);
    77
    88        case ExampleArgumentType.Float:
    9         case ExampleArgumentType.FloatCollection: return string.Join(valueSeparator, example.InputFloat);
     9        case ExampleArgumentType.FloatVector: return string.Join(valueSeparator, example.InputFloat);
    1010
    11         case ExampleArgumentType.Bool: return string.Join(valueSeparator, example.InputBoolean);
     11        case ExampleArgumentType.Boolean: return string.Join(valueSeparator, example.InputBoolean);
    1212        case ExampleArgumentType.Char: return string.Join(valueSeparator, example.InputChar);
    1313
    1414        case ExampleArgumentType.String:
    15         case ExampleArgumentType.StringCollection: return string.Join(valueSeparator, example.InputString);
     15        case ExampleArgumentType.StringVector: return string.Join(valueSeparator, example.InputString);
    1616        default: return string.Empty;
    1717      }
    … …  
    2121      switch (type) {
    2222        case ExampleArgumentType.Integer:
    23         case ExampleArgumentType.IntegerCollection: return string.Join(valueSeparator, example.OutputInt);
     23        case ExampleArgumentType.IntegerVector: return string.Join(valueSeparator, example.OutputInteger);
    2424
    2525        case ExampleArgumentType.Float:
    26         case ExampleArgumentType.FloatCollection: return string.Join(valueSeparator, example.OutputFloat);
     26        case ExampleArgumentType.FloatVector: return string.Join(valueSeparator, example.OutputFloat);
    2727
    28         case ExampleArgumentType.Bool: return string.Join(valueSeparator, example.OutputBoolean);
     28        case ExampleArgumentType.Boolean: return string.Join(valueSeparator, example.OutputBoolean);
    2929        case ExampleArgumentType.Char: return string.Join(valueSeparator, example.OutputChar);
    3030
    3131        case ExampleArgumentType.String:
    32         case ExampleArgumentType.StringCollection: return string.Join(valueSeparator, example.OutputString);
     32        case ExampleArgumentType.StringVector: return string.Join(valueSeparator, example.OutputString);
    3333        default: return string.Empty;
    3434      }
    … …  
    4747        case ExampleArgumentType.Integer: return IntegerColumnHeader;
    4848        case ExampleArgumentType.Float: return DoubleColumnHeader;
    49         case ExampleArgumentType.Bool: return BooleanColumnHeader;
     49        case ExampleArgumentType.Boolean: return BooleanColumnHeader;
    5050        case ExampleArgumentType.Char: return CharColumnHeader;
    5151        case ExampleArgumentType.String: return StringColumnHeader;
    52         case ExampleArgumentType.IntegerCollection: return IntegersColumnHeader;
    53         case ExampleArgumentType.FloatCollection: return DoublesColumnHeader;
    54         case ExampleArgumentType.StringCollection: return StringsColumnHeader;
     52        case ExampleArgumentType.IntegerVector: return IntegersColumnHeader;
     53        case ExampleArgumentType.FloatVector: return DoublesColumnHeader;
     54        case ExampleArgumentType.StringVector: return StringsColumnHeader;
    5555        default: return string.Empty;
    5656      }
Note: See TracChangeset for help on using the changeset viewer.