Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/06/12 20:21:07 (12 years ago)
Author:
ascheibe
Message:

#1174 added support for TimeSpanValue for querying the execution time

Location:
branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3
Files:
5 added
7 edited

Legend:

Unmodified
Added
Removed

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

    r7573 r7574  
    147147    <Compile Include="Query\DataTransfer\BoolValue.cs" />
    148148    <Compile Include="Query\DataTransfer\CombinedFilter.cs" />
     149    <Compile Include="Query\DataTransfer\NameOrdinalComparisonTimeSpanFilter.cs" />
     150    <Compile Include="Query\DataTransfer\OrdinalComparisonTimeSpanFilter.cs" />
     151    <Compile Include="Query\DataTransfer\TimeSpanValue.cs" />
    149152    <Compile Include="Query\DataTransfer\OrdinalComparisonPercentFilter.cs" />
    150153    <Compile Include="Query\DataTransfer\NameOrdinalComparisonPercentFilter.cs" />
    … …  
    195198    <Compile Include="Query\Filters\BoolValueFilter.cs" />
    196199    <Compile Include="Query\Filters\BinaryValueFilter.cs" />
     200    <Compile Include="Query\Filters\TimeSpanValueFilter.cs" />
    197201    <Compile Include="Query\Filters\PercentValueFilter.cs" />
    198202    <Compile Include="Query\Filters\StringValueFilter.cs" />
    … …  
    237241    <Compile Include="RunCreation\DataTransfer\BinaryValue.cs" />
    238242    <Compile Include="RunCreation\DataTransfer\BoolValue.cs" />
     243    <Compile Include="RunCreation\DataTransfer\TimeSpanValue.cs" />
    239244    <Compile Include="RunCreation\DataTransfer\PercentValue.cs" />
    240245    <Compile Include="RunCreation\DataTransfer\DataType.cs" />

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Convert.cs

    r7573 r7574  
    5656      } else if (source.ValueName.Type == DA.ValueNameType.Int) {
    5757        return new DT.IntValue { Name = source.ValueName.Name, DataType = Convert.ToDto(source.DataType), Value = source.IntValue.GetValueOrDefault() };
     58      } else if (source.ValueName.Type == DA.ValueNameType.TimeSpan) {
     59        return new DT.TimeSpanValue { Name = source.ValueName.Name, DataType = Convert.ToDto(source.DataType), Value = source.LongValue.GetValueOrDefault() };
    5860      } else if (source.ValueName.Type == DA.ValueNameType.Long) {
    5961        return new DT.LongValue { Name = source.ValueName.Name, DataType = Convert.ToDto(source.DataType), Value = source.LongValue.GetValueOrDefault() };

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

    r7573 r7574  
    3636  [KnownType(typeof(NameOrdinalComparisonIntFilter))]
    3737  [KnownType(typeof(NameOrdinalComparisonLongFilter))]
     38  [KnownType(typeof(NameOrdinalComparisonTimeSpanFilter))]
    3839  [KnownType(typeof(NameStringComparisonFilter))]
    3940  [KnownType(typeof(NameStringComparisonAvailableValuesFilter))]

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

    r7573 r7574  
    3232  [KnownType(typeof(BinaryValue))]
    3333  [KnownType(typeof(PercentValue))]
     34  [KnownType(typeof(TimeSpanValue))]
    3435  public abstract class Value {
    3536    [DataMember]

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/QueryService.cs

    r7573 r7574  
    7575            name
    7676          ));
     77        foreach (string name in okb.ValueNames.Where(x => (x.Category == ValueNameCategory.Parameter) && (x.Type == ValueNameType.TimeSpan)).Select(x => x.Name).Distinct())
     78          filters.Add(new NameOrdinalComparisonTimeSpanFilter(
     79            typeof(TimeSpanValueFilter).AssemblyQualifiedName,
     80            "Parameter " + name + " Value",
     81            name
     82          ));
    7783        foreach (string name in okb.ValueNames.Where(x => (x.Category == ValueNameCategory.Parameter) && (x.Type == ValueNameType.Float)).Select(x => x.Name).Distinct())
    7884          filters.Add(new NameOrdinalComparisonFloatFilter(
    … …  
    138144            name
    139145          ));
     146        foreach (string name in okb.ValueNames.Where(x => (x.Category == ValueNameCategory.Result) && (x.Type == ValueNameType.TimeSpan)).Select(x => x.Name).Distinct())
     147          filters.Add(new NameOrdinalComparisonTimeSpanFilter(
     148            typeof(TimeSpanValueFilter).AssemblyQualifiedName,
     149            "Result " + name + " Value",
     150            name
     151          ));
    140152        foreach (string name in okb.ValueNames.Where(x => (x.Category == ValueNameCategory.Result) && (x.Type == ValueNameType.Float)).Select(x => x.Name).Distinct())
    141153          filters.Add(new NameOrdinalComparisonFloatFilter(

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/RunCreation/Convert.cs

    r7573 r7574  
    7777        entity.ValueName = Convert.ToEntity(source.Name, category, DA.ValueNameType.Int, okb);
    7878        entity.IntValue = ((DT.IntValue)source).Value;
     79      } else if (source is DT.TimeSpanValue) {
     80        entity.ValueName = Convert.ToEntity(source.Name, category, DA.ValueNameType.TimeSpan, okb);
     81        entity.LongValue = ((DT.TimeSpanValue)source).Value;
    7982      } else if (source is DT.LongValue) {
    8083        entity.ValueName = Convert.ToEntity(source.Name, category, DA.ValueNameType.Long, okb);

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

    r7573 r7574  
    3232  [KnownType(typeof(BinaryValue))]
    3333  [KnownType(typeof(PercentValue))]
     34  [KnownType(typeof(TimeSpanValue))]
    3435  public abstract class Value {
    3536    [DataMember]
Note: See TracChangeset for help on using the changeset viewer.