Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/18/17 01:15:25 (8 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/Example.cs

    r14834 r14875  
    1111    private static readonly char[] emptyChars = new char[0];
    1212    private static readonly string[] emptyStrings = new string[0];
     13    private static readonly long[][] emptyIntegerVectors = new long[0][];
     14    private static readonly double[][] emptyFloatVectors = new double[0][];
     15    private static readonly bool[][] emptyBooleanVectors = new bool[0][];
     16    private static readonly string[][] emptyStringVectors = new string[0][];
    1317
    1418
    1519    public Example() {
    16       InputInt = emptyIntegers;
     20      this.InputInteger = emptyIntegers;
    1721      InputFloat = emptyFloats;
    1822      InputBoolean = emptyBooleans;
    1923      InputChar = emptyChars;
    2024      InputString = emptyStrings;
     25      InputIntegerVector = emptyIntegerVectors;
     26      InputFloatVector = emptyFloatVectors;
     27      InputBooleanVector = emptyBooleanVectors;
     28      InputStringVector = emptyStringVectors;
    2129
    22       OutputInt = emptyIntegers;
     30      this.OutputInteger = emptyIntegers;
    2331      OutputFloat = emptyFloats;
    2432      OutputBoolean = emptyBooleans;
    2533      OutputChar = emptyChars;
    2634      OutputString = emptyStrings;
     35      OutputIntegerVector = emptyIntegerVectors;
     36      OutputFloatVector = emptyFloatVectors;
     37      OutputBooleanVector = emptyBooleanVectors;
     38      OutputStringVector = emptyStringVectors;
    2739    }
    2840
    … …  
    3244
    3345      InputBoolean = (bool[])origin.InputBoolean.Clone();
    34       InputInt = (long[])origin.InputInt.Clone();
     46      InputInteger = (long[])origin.InputInteger.Clone();
    3547      InputFloat = (double[])origin.InputFloat.Clone();
    3648      InputChar = (char[])origin.InputChar.Clone();
    3749      InputString = (string[])origin.InputString.Clone();
     50      InputIntegerVector = (long[][])origin.InputIntegerVector.Clone();
     51      InputFloatVector = (double[][])origin.InputFloatVector.Clone();
     52      InputBooleanVector = (bool[][])origin.InputBooleanVector.Clone();
     53      InputStringVector = (string[][])origin.InputStringVector.Clone();
    3854
    3955      OutputBoolean = (bool[])origin.OutputBoolean.Clone();
    40       OutputInt = (long[])origin.OutputInt.Clone();
     56      this.OutputInteger = (long[])origin.OutputInteger.Clone();
    4157      OutputFloat = (double[])origin.OutputFloat.Clone();
    4258      OutputChar = (char[])origin.OutputChar.Clone();
    4359      OutputString = (string[])origin.OutputString.Clone();
     60      OutputIntegerVector = (long[][])origin.OutputIntegerVector.Clone();
     61      OutputFloatVector = (double[][])origin.OutputFloatVector.Clone();
     62      OutputBooleanVector = (bool[][])origin.OutputBooleanVector.Clone();
     63      OutputStringVector = (string[][])origin.OutputStringVector.Clone();
    4464    }
    4565
    … …  
    5373
    5474    [Storable]
    55     public long[] InputInt { get; set; }
     75    public long[] InputInteger { get; set; }
    5676    [Storable]
    5777    public double[] InputFloat { get; set; }
    … …  
    6282    [Storable]
    6383    public string[] InputString { get; set; }
     84    [Storable]
     85    public long[][] InputIntegerVector { get; set; }
     86    [Storable]
     87    public double[][] InputFloatVector { get; set; }
     88    [Storable]
     89    public bool[][] InputBooleanVector { get; set; }
     90    [Storable]
     91    public string[][] InputStringVector { get; set; }
    6492
    6593    [Storable]
    66     public long[] OutputInt { get; set; }
     94    public long[] OutputInteger { get; set; }
    6795    [Storable]
    6896    public double[] OutputFloat { get; set; }
    … …  
    73101    [Storable]
    74102    public string[] OutputString { get; set; }
     103    [Storable]
     104    public long[][] OutputIntegerVector { get; set; }
     105    [Storable]
     106    public double[][] OutputFloatVector { get; set; }
     107    [Storable]
     108    public bool[][] OutputBooleanVector { get; set; }
     109    [Storable]
     110    public string[][] OutputStringVector { get; set; }
    75111
    76112    public override IDeepCloneable Clone(Cloner cloner) {
Note: See TracChangeset for help on using the changeset viewer.