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

Location:
branches/PushGP/HeuristicLab.PushGP/HeuristicLab.Problem.ProgramSynthesis.BenchmarkSuite/Views
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r14834 r14875  
    88
    99  [View("Push Expression Selection Editor")]
    10   [Content(typeof(Data), true)]
     10  [Content(typeof(ProblemData), true)]
    1111  public partial class DataEditorView : NamedItemView {
    1212    private const string ValueSeparator = ", ";
    … …  
    5858
    5959        switch (type) {
    60           case ExampleArgumentType.Bool:
     60          case ExampleArgumentType.Boolean:
    6161            example.InputBoolean = new[] { ExampleArgumentConverter.ConvertBoolean(arg) };
    6262            example.InputArgs[i] = arg;
    6363            break;
    6464          case ExampleArgumentType.Integer:
    65             example.InputInt = new[] { ExampleArgumentConverter.ConvertInteger(arg) };
     65            example.InputInteger = new[] { ExampleArgumentConverter.ConvertInteger(arg) };
    6666            example.InputArgs[i] = arg;
    6767            break;
    68           case ExampleArgumentType.IntegerCollection:
    69             example.InputInt = ExampleArgumentConverter.ConvertIntegers(arg);
    70             example.InputArgs[i] = string.Join(ValueSeparator, example.InputInt);
     68          case ExampleArgumentType.IntegerVector:
     69            example.InputInteger = ExampleArgumentConverter.ConvertIntegers(arg);
     70            example.InputArgs[i] = string.Join(ValueSeparator, example.InputInteger);
    7171            break;
    7272          case ExampleArgumentType.Float:
    … …  
    7474            example.InputArgs[i] = arg;
    7575            break;
    76           case ExampleArgumentType.FloatCollection:
     76          case ExampleArgumentType.FloatVector:
    7777            example.InputFloat = ExampleArgumentConverter.ConvertDoubles(arg);
    7878            example.InputArgs[i] = string.Join(ValueSeparator, example.InputFloat);
    … …  
    8787
    8888        switch (type) {
    89           case ExampleArgumentType.Bool:
     89          case ExampleArgumentType.Boolean:
    9090            example.OutputBoolean = new[] { ExampleArgumentConverter.ConvertBoolean(arg) };
    9191            example.OutputArgs[i] = arg;
    9292            break;
    9393          case ExampleArgumentType.Integer:
    94             example.OutputInt = new[] { ExampleArgumentConverter.ConvertInteger(arg) };
     94            example.OutputInteger = new[] { ExampleArgumentConverter.ConvertInteger(arg) };
    9595            example.OutputArgs[i] = arg;
    9696            break;
    97           case ExampleArgumentType.IntegerCollection:
    98             example.OutputInt = ExampleArgumentConverter.ConvertIntegers(arg);
    99             example.OutputArgs[i] = string.Join(ValueSeparator, example.OutputInt);
     97          case ExampleArgumentType.IntegerVector:
     98            example.OutputInteger = ExampleArgumentConverter.ConvertIntegers(arg);
     99            example.OutputArgs[i] = string.Join(ValueSeparator, example.OutputInteger);
    100100            break;
    101101          case ExampleArgumentType.Float:
    … …  
    103103            example.OutputArgs[i] = arg;
    104104            break;
    105           case ExampleArgumentType.FloatCollection:
     105          case ExampleArgumentType.FloatVector:
    106106            example.OutputFloat = ExampleArgumentConverter.ConvertDoubles(arg);
    107107            example.OutputArgs[i] = string.Join(ValueSeparator, example.OutputFloat);
    … …  
    113113    }
    114114
    115     public new Data Content
     115    public new ProblemData Content
    116116    {
    117       get { return (Data)base.Content; }
     117      get { return (ProblemData)base.Content; }
    118118      set
    119119      {

  • 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.