Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
01/26/11 02:10:46 (13 years ago)
Author:
swagner
Message:

Worked on OKB (#1174)

Location:
branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataTransfer/3.3
Files:
12 added
31 deleted
7 edited
5 moved

Legend:

Unmodified
Added
Removed

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataTransfer/3.3/Algorithm.cs

    r4455 r5378  
    2929    [DataMember]
    3030    public long AlgorithmClassId { get; set; }
     31    [DataMember]
     32    public long DataTypeId { get; set; }
     33    [DataMember]
     34    public long BinaryDataId { get; set; }
    3135  }
    3236}

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataTransfer/3.3/DataType.cs

    r5295 r5378  
    3030    public string TypeName { get; set; }
    3131    [DataMember]
    32     public string SqlName { get; set; }
    33     [DataMember]
    3432    public long PlatformId { get; set; }
    3533  }

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataTransfer/3.3/Filters/Filter.cs

    r5304 r5378  
    2525  [DataContract]
    2626  [KnownType(typeof(OrdinalComparisonDateTimeFilter))]
     27  [KnownType(typeof(OrdinalComparisonIntFilter))]
    2728  [KnownType(typeof(OrdinalComparisonLongFilter))]
    28   [KnownType(typeof(SetComparisonStringFilter))]
    29   [KnownType(typeof(SetComparisonStringAvailableValuesFilter))]
     29  [KnownType(typeof(StringComparisonFilter))]
     30  [KnownType(typeof(StringComparisonAvailableValuesFilter))]
    3031  [KnownType(typeof(NameEqualityComparisonBoolFilter))]
    3132  [KnownType(typeof(NameEqualityComparisonByteArrayFilter))]
     33  [KnownType(typeof(NameOrdinalComparisonFloatFilter))]
    3234  [KnownType(typeof(NameOrdinalComparisonDoubleFilter))]
     35  [KnownType(typeof(NameOrdinalComparisonIntFilter))]
    3336  [KnownType(typeof(NameOrdinalComparisonLongFilter))]
    34   [KnownType(typeof(NameSetComparisonStringFilter))]
    35   [KnownType(typeof(NameSetComparisonStringAvailableValuesFilter))]
     37  [KnownType(typeof(NameStringComparisonFilter))]
     38  [KnownType(typeof(NameStringComparisonAvailableValuesFilter))]
    3639  [KnownType(typeof(CombinedFilter))]
    3740  public abstract class Filter {

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataTransfer/3.3/Filters/NameStringComparisonAvailableValuesFilter.cs

    r5377 r5378  
    2525namespace HeuristicLab.Services.OKB.DataTransfer {
    2626  [DataContract]
    27   public class NameSetComparisonStringAvailableValuesFilter : NameSetComparisonStringFilter {
     27  public class NameStringComparisonAvailableValuesFilter : NameStringComparisonFilter {
    2828    [DataMember]
    2929    public IEnumerable<string> AvailableValues { get; protected set; }
    3030
    31     public NameSetComparisonStringAvailableValuesFilter(string filterTypeName, string label, string name, IEnumerable<string> availableValues)
     31    public NameStringComparisonAvailableValuesFilter(string filterTypeName, string label, string name, IEnumerable<string> availableValues)
    3232      : base(filterTypeName, label, name) {
    3333      AvailableValues = availableValues;

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataTransfer/3.3/Filters/NameStringComparisonFilter.cs

    r5377 r5378  
    2424namespace HeuristicLab.Services.OKB.DataTransfer {
    2525  [DataContract]
    26   public class NameSetComparisonStringFilter : SetComparisonFilter {
     26  public class NameStringComparisonFilter : StringComparisonFilter {
    2727    [DataMember]
    2828    public string Name { get; protected set; }
    29     [DataMember]
    30     public string Value { get; set; }
    3129
    32     public NameSetComparisonStringFilter(string filterTypeName, string label, string name) {
    33       FilterTypeName = filterTypeName;
    34       Label = label;
     30    public NameStringComparisonFilter(string filterTypeName, string label, string name)
     31      : base(filterTypeName, label) {
    3532      Name = name;
    3633    }

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataTransfer/3.3/Filters/StringComparison.cs

    r5377 r5378  
    2424namespace HeuristicLab.Services.OKB.DataTransfer {
    2525  [DataContract]
    26   public enum SetComparison {
     26  public enum StringComparison {
    2727    [EnumMember]
    2828    Equal,
    … …  
    3232    Contains,
    3333    [EnumMember]
    34     NotContains
     34    NotContains,
     35    [EnumMember]
     36    Like,
     37    [EnumMember]
     38    NotLike
    3539  }
    3640}

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataTransfer/3.3/Filters/StringComparisonAvailableValuesFilter.cs

    r5377 r5378  
    2525namespace HeuristicLab.Services.OKB.DataTransfer {
    2626  [DataContract]
    27   public class SetComparisonStringAvailableValuesFilter : SetComparisonStringFilter {
     27  public class StringComparisonAvailableValuesFilter : StringComparisonFilter {
    2828    [DataMember]
    2929    public IEnumerable<string> AvailableValues { get; protected set; }
    3030
    31     public SetComparisonStringAvailableValuesFilter(string filterTypeName, string label, IEnumerable<string> availableValues)
     31    public StringComparisonAvailableValuesFilter(string filterTypeName, string label, IEnumerable<string> availableValues)
    3232      : base(filterTypeName, label) {
    3333      AvailableValues = availableValues;

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataTransfer/3.3/Filters/StringComparisonFilter.cs

    r5377 r5378  
    2424namespace HeuristicLab.Services.OKB.DataTransfer {
    2525  [DataContract]
    26   public abstract class SetComparisonFilter : Filter {
     26  public class StringComparisonFilter : Filter {
    2727    [DataMember]
    28     public SetComparison Comparison { get; set; }
     28    public StringComparison Comparison { get; set; }
     29    [DataMember]
     30    public string Value { get; set; }
     31
     32    public StringComparisonFilter(string filterTypeName, string label) {
     33      FilterTypeName = filterTypeName;
     34      Label = label;
     35    }
    2936  }
    3037}

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataTransfer/3.3/HeuristicLab.Services.OKB.DataTransfer-3.3.csproj

    r5304 r5378  
    5050    <Compile Include="AlgorithmClass.cs" />
    5151    <Compile Include="Algorithm.cs" />
    52     <Compile Include="AlgorithmData.cs" />
    53     <Compile Include="AlgorithmParameter.cs" />
    54     <Compile Include="AlgorithmParameterValue.cs" />
    55     <Compile Include="AlgorithmParameterBlobValue.cs" />
    56     <Compile Include="AlgorithmParameterBoolValue.cs" />
    57     <Compile Include="AlgorithmParameterFloatValue.cs" />
    58     <Compile Include="AlgorithmParameterIntValue.cs" />
    59     <Compile Include="AlgorithmParameterStringValue.cs" />
     52    <Compile Include="BinaryData.cs">
     53      <SubType>Code</SubType>
     54    </Compile>
     55    <Compile Include="BoolValue.cs" />
     56    <Compile Include="BinaryValue.cs" />
     57    <Compile Include="IntValue.cs" />
     58    <Compile Include="LongValue.cs" />
     59    <Compile Include="FloatValue.cs" />
     60    <Compile Include="DoubleValue.cs" />
     61    <Compile Include="StringValue.cs" />
     62    <Compile Include="Value.cs" />
    6063    <Compile Include="Filters\BooleanOperation.cs" />
    61     <Compile Include="QueryBoolValue.cs" />
    62     <Compile Include="QueryBlobValue.cs" />
    63     <Compile Include="QueryFloatValue.cs" />
    64     <Compile Include="QueryIntValue.cs" />
    65     <Compile Include="QueryStringValue.cs" />
    66     <Compile Include="QueryValue.cs" />
     64    <Compile Include="Filters\NameOrdinalComparisonFloatFilter.cs" />
     65    <Compile Include="Filters\NameOrdinalComparisonIntFilter.cs" />
     66    <Compile Include="Filters\OrdinalComparisonIntFilter.cs" />
     67    <Compile Include="Filters\NameStringComparisonAvailableValuesFilter.cs" />
     68    <Compile Include="Filters\NameStringComparisonFilter.cs" />
     69    <Compile Include="Filters\StringComparison.cs" />
     70    <Compile Include="Filters\StringComparisonAvailableValuesFilter.cs" />
     71    <Compile Include="Filters\StringComparisonFilter.cs" />
    6772    <Compile Include="QueryResult.cs" />
    6873    <Compile Include="Filters\CombinedFilter.cs" />
    69     <Compile Include="Filters\NameSetComparisonStringAvailableValuesFilter.cs" />
    70     <Compile Include="Filters\SetComparisonStringAvailableValuesFilter.cs" />
    7174    <Compile Include="Filters\OrdinalComparisonFilter.cs" />
    72     <Compile Include="Filters\SetComparisonFilter.cs" />
    7375    <Compile Include="Filters\EqualityComparisonFilter.cs" />
    7476    <Compile Include="Filters\OrdinalComparisonDateTimeFilter.cs" />
    7577    <Compile Include="Filters\NameEqualityComparisonByteArrayFilter.cs" />
    76     <Compile Include="Filters\NameSetComparisonStringFilter.cs" />
    7778    <Compile Include="Filters\NameOrdinalComparisonLongFilter.cs" />
    7879    <Compile Include="Filters\NameOrdinalComparisonDoubleFilter.cs" />
    7980    <Compile Include="Filters\NameEqualityComparisonBoolFilter.cs" />
    8081    <Compile Include="Filters\OrdinalComparisonLongFilter.cs" />
    81     <Compile Include="Filters\SetComparison.cs" />
    8282    <Compile Include="Filters\OrdinalComparison.cs" />
    8383    <Compile Include="Filters\EqualityComparison.cs" />
    84     <Compile Include="Filters\SetComparisonStringFilter.cs" />
    8584    <Compile Include="Filters\Filter.cs" />
    86     <Compile Include="ResultFloatValue.cs" />
    87     <Compile Include="ResultBoolValue.cs" />
    88     <Compile Include="ResultIntValue.cs" />
    89     <Compile Include="ResultStringValue.cs" />
    90     <Compile Include="ResultBlobValue.cs" />
    91     <Compile Include="ProblemParameterBoolValue.cs" />
    92     <Compile Include="ProblemParameterFloatValue.cs" />
    93     <Compile Include="ProblemParameterIntValue.cs" />
    94     <Compile Include="ProblemParameterStringValue.cs" />
    95     <Compile Include="ProblemParameterBlobValue.cs" />
    96     <Compile Include="ResultValue.cs" />
    97     <Compile Include="ProblemParameterValue.cs" />
    9885    <Compile Include="Run.cs" />
    99     <Compile Include="Experiment.cs" />
    100     <Compile Include="Result.cs" />
    101     <Compile Include="ProblemParameter.cs" />
    102     <Compile Include="ProblemData.cs" />
    10386    <Compile Include="Problem.cs" />
    10487    <Compile Include="ProblemClass.cs" />

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataTransfer/3.3/Problem.cs

    r4481 r5378  
    2929    [DataMember]
    3030    public long ProblemClassId { get; set; }
     31    [DataMember]
     32    public long DataTypeId { get; set; }
     33    [DataMember]
     34    public long BinaryDataId { get; set; }
    3135  }
    3236}

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataTransfer/3.3/QueryResult.cs

    r5304 r5378  
    2929    public long Id { get; set; }
    3030    [DataMember]
    31     public IEnumerable<QueryValue> AlgorithmParameters { get; set; }
     31    public IEnumerable<Value> Parameters { get; set; }
    3232    [DataMember]
    33     public IEnumerable<QueryValue> ProblemParameters { get; set; }
    34     [DataMember]
    35     public IEnumerable<QueryValue> Results { get; set; }
     33    public IEnumerable<Value> Results { get; set; }
    3634  }
    3735}

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataTransfer/3.3/Run.cs

    r5295 r5378  
    2828  public class Run : OKBItem {
    2929    [DataMember]
    30     public long RandomSeed { get; set; }
     30    public int RandomSeed { get; set; }
    3131    [DataMember]
    3232    public DateTime CreatedDate { get; set; }
    3333    [DataMember]
    34     public long ExperimentId { get; set; }
     34    public long AlgorithmId { get; set; }
     35    [DataMember]
     36    public long ProblemId { get; set; }
    3537    [DataMember]
    3638    public Guid UserId { get; set; }
    … …  
    3840    public Guid ClientId { get; set; }
    3941    [DataMember]
    40     public IEnumerable<ResultValue> ResultValues { get; set; }
     42    public IEnumerable<Value> ParameterValues { get; set; }
     43    [DataMember]
     44    public IEnumerable<Value> ResultValues { get; set; }
    4145  }
    4246}
Note: See TracChangeset for help on using the changeset viewer.