Changeset 7574


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

#1174 added support for TimeSpanValue for querying the execution time

Location:
branches/OKB (trunk integration)
Files:
9 added
12 edited

Legend:

Unmodified
Added
Removed
  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/HeuristicLab.Clients.OKB-3.3.csproj

    r7573 r7574  
    206206    <Compile Include="Query\QueryMenuItem.cs" />
    207207    <Compile Include="Query\ServiceClient\CombinedFilter.cs" />
     208    <Compile Include="Query\ServiceClient\OrdinalComparisonTimeSpanFilter.cs" />
     209    <Compile Include="Query\ServiceClient\NameOrdinalComparisonTimeSpanFilter.cs" />
    208210    <Compile Include="Query\ServiceClient\OrdinalComparisonPercentFilter.cs" />
    209211    <Compile Include="Query\ServiceClient\NameOrdinalComparisonPercentFilter.cs" />
     
    233235      <DependentUpon>CombinedFilterView.cs</DependentUpon>
    234236    </Compile>
     237    <Compile Include="Query\Views\OrdinalComparisonTimeSpanFilterView.cs">
     238      <SubType>UserControl</SubType>
     239    </Compile>
     240    <Compile Include="Query\Views\OrdinalComparisonTimeSpanFilterView.Designer.cs">
     241      <DependentUpon>OrdinalComparisonTimeSpanFilterView.cs</DependentUpon>
     242    </Compile>
    235243    <Compile Include="Query\Views\OrdinalComparisonPercentFilterView.cs">
    236244      <SubType>UserControl</SubType>
  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/QueryServiceClient.cs

    r7573 r7574  
    1818    [System.Runtime.Serialization.DataContractAttribute(Name="Filter", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    1919        "fer")]
    20     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.CombinedFilter))]
    2120    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonFilter))]
     21    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonTimeSpanFilter))]
     22    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonTimeSpanFilter))]
    2223    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonLongFilter))]
    2324    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonLongFilter))]
     25    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonDateTimeFilter))]
    2426    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonIntFilter))]
    2527    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonIntFilter))]
     
    3032    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonPercentFilter))]
    3133    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonPercentFilter))]
    32     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonDateTimeFilter))]
    3334    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.StringComparisonFilter))]
    3435    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.StringComparisonAvailableValuesFilter))]
    3536    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameStringComparisonAvailableValuesFilter))]
    3637    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameStringComparisonFilter))]
     38    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.CombinedFilter))]
    3739    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.EqualityComparisonFilter))]
    3840    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.EqualityComparisonBoolFilter))]
     
    109111    [System.Diagnostics.DebuggerStepThroughAttribute()]
    110112    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    111     [System.Runtime.Serialization.DataContractAttribute(Name="CombinedFilter", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    112         "fer")]
    113     public partial class CombinedFilter : HeuristicLab.Clients.OKB.Query.Filter
    114     {
    115        
    116         private System.Collections.Generic.List<HeuristicLab.Clients.OKB.Query.Filter> FiltersField;
    117        
    118         private HeuristicLab.Clients.OKB.Query.BooleanOperation OperationField;
    119        
    120         [System.Runtime.Serialization.DataMemberAttribute()]
    121         public System.Collections.Generic.List<HeuristicLab.Clients.OKB.Query.Filter> Filters
    122         {
    123             get
    124             {
    125                 return this.FiltersField;
    126             }
    127             set
    128             {
    129                 if ((object.ReferenceEquals(this.FiltersField, value) != true))
    130                 {
    131                     this.FiltersField = value;
    132                     this.RaisePropertyChanged("Filters");
    133                 }
    134             }
    135         }
    136        
    137         [System.Runtime.Serialization.DataMemberAttribute()]
    138         public HeuristicLab.Clients.OKB.Query.BooleanOperation Operation
    139         {
    140             get
    141             {
    142                 return this.OperationField;
    143             }
    144             set
    145             {
    146                 if ((this.OperationField.Equals(value) != true))
    147                 {
    148                     this.OperationField = value;
    149                     this.RaisePropertyChanged("Operation");
    150                 }
    151             }
    152         }
    153     }
    154    
    155     [System.Diagnostics.DebuggerStepThroughAttribute()]
    156     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    157113    [System.Runtime.Serialization.DataContractAttribute(Name="OrdinalComparisonFilter", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    158114        "fer")]
     115    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonTimeSpanFilter))]
     116    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonTimeSpanFilter))]
    159117    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonLongFilter))]
    160118    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonLongFilter))]
     119    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonDateTimeFilter))]
    161120    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonIntFilter))]
    162121    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonIntFilter))]
     
    167126    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonPercentFilter))]
    168127    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonPercentFilter))]
    169     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonDateTimeFilter))]
    170128    public partial class OrdinalComparisonFilter : HeuristicLab.Clients.OKB.Query.Filter
    171129    {
     
    193151    [System.Diagnostics.DebuggerStepThroughAttribute()]
    194152    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     153    [System.Runtime.Serialization.DataContractAttribute(Name="OrdinalComparisonTimeSpanFilter", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     154        "fer")]
     155    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonTimeSpanFilter))]
     156    public partial class OrdinalComparisonTimeSpanFilter : HeuristicLab.Clients.OKB.Query.OrdinalComparisonFilter
     157    {
     158       
     159        private long ValueField;
     160       
     161        [System.Runtime.Serialization.DataMemberAttribute()]
     162        public long Value
     163        {
     164            get
     165            {
     166                return this.ValueField;
     167            }
     168            set
     169            {
     170                if ((this.ValueField.Equals(value) != true))
     171                {
     172                    this.ValueField = value;
     173                    this.RaisePropertyChanged("Value");
     174                }
     175            }
     176        }
     177    }
     178   
     179    [System.Diagnostics.DebuggerStepThroughAttribute()]
     180    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     181    [System.Runtime.Serialization.DataContractAttribute(Name="NameOrdinalComparisonTimeSpanFilter", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     182        "fer")]
     183    public partial class NameOrdinalComparisonTimeSpanFilter : HeuristicLab.Clients.OKB.Query.OrdinalComparisonTimeSpanFilter
     184    {
     185       
     186        private string NameField;
     187       
     188        [System.Runtime.Serialization.DataMemberAttribute()]
     189        public string Name
     190        {
     191            get
     192            {
     193                return this.NameField;
     194            }
     195            set
     196            {
     197                if ((object.ReferenceEquals(this.NameField, value) != true))
     198                {
     199                    this.NameField = value;
     200                    this.RaisePropertyChanged("Name");
     201                }
     202            }
     203        }
     204    }
     205   
     206    [System.Diagnostics.DebuggerStepThroughAttribute()]
     207    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    195208    [System.Runtime.Serialization.DataContractAttribute(Name="OrdinalComparisonLongFilter", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    196209        "fer")]
     
    248261    [System.Diagnostics.DebuggerStepThroughAttribute()]
    249262    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     263    [System.Runtime.Serialization.DataContractAttribute(Name="OrdinalComparisonDateTimeFilter", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     264        "fer")]
     265    public partial class OrdinalComparisonDateTimeFilter : HeuristicLab.Clients.OKB.Query.OrdinalComparisonFilter
     266    {
     267       
     268        private System.DateTime ValueField;
     269       
     270        [System.Runtime.Serialization.DataMemberAttribute()]
     271        public System.DateTime Value
     272        {
     273            get
     274            {
     275                return this.ValueField;
     276            }
     277            set
     278            {
     279                if ((this.ValueField.Equals(value) != true))
     280                {
     281                    this.ValueField = value;
     282                    this.RaisePropertyChanged("Value");
     283                }
     284            }
     285        }
     286    }
     287   
     288    [System.Diagnostics.DebuggerStepThroughAttribute()]
     289    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    250290    [System.Runtime.Serialization.DataContractAttribute(Name="OrdinalComparisonIntFilter", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    251291        "fer")]
     
    461501                    this.NameField = value;
    462502                    this.RaisePropertyChanged("Name");
    463                 }
    464             }
    465         }
    466     }
    467    
    468     [System.Diagnostics.DebuggerStepThroughAttribute()]
    469     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    470     [System.Runtime.Serialization.DataContractAttribute(Name="OrdinalComparisonDateTimeFilter", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    471         "fer")]
    472     public partial class OrdinalComparisonDateTimeFilter : HeuristicLab.Clients.OKB.Query.OrdinalComparisonFilter
    473     {
    474        
    475         private System.DateTime ValueField;
    476        
    477         [System.Runtime.Serialization.DataMemberAttribute()]
    478         public System.DateTime Value
    479         {
    480             get
    481             {
    482                 return this.ValueField;
    483             }
    484             set
    485             {
    486                 if ((this.ValueField.Equals(value) != true))
    487                 {
    488                     this.ValueField = value;
    489                     this.RaisePropertyChanged("Value");
    490503                }
    491504            }
     
    619632                    this.NameField = value;
    620633                    this.RaisePropertyChanged("Name");
     634                }
     635            }
     636        }
     637    }
     638   
     639    [System.Diagnostics.DebuggerStepThroughAttribute()]
     640    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     641    [System.Runtime.Serialization.DataContractAttribute(Name="CombinedFilter", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     642        "fer")]
     643    public partial class CombinedFilter : HeuristicLab.Clients.OKB.Query.Filter
     644    {
     645       
     646        private System.Collections.Generic.List<HeuristicLab.Clients.OKB.Query.Filter> FiltersField;
     647       
     648        private HeuristicLab.Clients.OKB.Query.BooleanOperation OperationField;
     649       
     650        [System.Runtime.Serialization.DataMemberAttribute()]
     651        public System.Collections.Generic.List<HeuristicLab.Clients.OKB.Query.Filter> Filters
     652        {
     653            get
     654            {
     655                return this.FiltersField;
     656            }
     657            set
     658            {
     659                if ((object.ReferenceEquals(this.FiltersField, value) != true))
     660                {
     661                    this.FiltersField = value;
     662                    this.RaisePropertyChanged("Filters");
     663                }
     664            }
     665        }
     666       
     667        [System.Runtime.Serialization.DataMemberAttribute()]
     668        public HeuristicLab.Clients.OKB.Query.BooleanOperation Operation
     669        {
     670            get
     671            {
     672                return this.OperationField;
     673            }
     674            set
     675            {
     676                if ((this.OperationField.Equals(value) != true))
     677                {
     678                    this.OperationField = value;
     679                    this.RaisePropertyChanged("Operation");
    621680                }
    622681            }
     
    766825   
    767826    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     827    [System.Runtime.Serialization.DataContractAttribute(Name="OrdinalComparison", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     828        "fer")]
     829    public enum OrdinalComparison : int
     830    {
     831       
     832        [System.Runtime.Serialization.EnumMemberAttribute()]
     833        Less = 0,
     834       
     835        [System.Runtime.Serialization.EnumMemberAttribute()]
     836        LessOrEqual = 1,
     837       
     838        [System.Runtime.Serialization.EnumMemberAttribute()]
     839        Equal = 2,
     840       
     841        [System.Runtime.Serialization.EnumMemberAttribute()]
     842        GreaterOrEqual = 3,
     843       
     844        [System.Runtime.Serialization.EnumMemberAttribute()]
     845        Greater = 4,
     846       
     847        [System.Runtime.Serialization.EnumMemberAttribute()]
     848        NotEqual = 5,
     849    }
     850   
     851    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     852    [System.Runtime.Serialization.DataContractAttribute(Name="StringComparison", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     853        "fer")]
     854    public enum StringComparison : int
     855    {
     856       
     857        [System.Runtime.Serialization.EnumMemberAttribute()]
     858        Equal = 0,
     859       
     860        [System.Runtime.Serialization.EnumMemberAttribute()]
     861        NotEqual = 1,
     862       
     863        [System.Runtime.Serialization.EnumMemberAttribute()]
     864        Contains = 2,
     865       
     866        [System.Runtime.Serialization.EnumMemberAttribute()]
     867        NotContains = 3,
     868       
     869        [System.Runtime.Serialization.EnumMemberAttribute()]
     870        Like = 4,
     871       
     872        [System.Runtime.Serialization.EnumMemberAttribute()]
     873        NotLike = 5,
     874    }
     875   
     876    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    768877    [System.Runtime.Serialization.DataContractAttribute(Name="BooleanOperation", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    769878        "fer")]
     
    779888   
    780889    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    781     [System.Runtime.Serialization.DataContractAttribute(Name="OrdinalComparison", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    782         "fer")]
    783     public enum OrdinalComparison : int
    784     {
    785        
    786         [System.Runtime.Serialization.EnumMemberAttribute()]
    787         Less = 0,
    788        
    789         [System.Runtime.Serialization.EnumMemberAttribute()]
    790         LessOrEqual = 1,
    791        
    792         [System.Runtime.Serialization.EnumMemberAttribute()]
    793         Equal = 2,
    794        
    795         [System.Runtime.Serialization.EnumMemberAttribute()]
    796         GreaterOrEqual = 3,
    797        
    798         [System.Runtime.Serialization.EnumMemberAttribute()]
    799         Greater = 4,
    800        
    801         [System.Runtime.Serialization.EnumMemberAttribute()]
    802         NotEqual = 5,
    803     }
    804    
    805     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    806     [System.Runtime.Serialization.DataContractAttribute(Name="StringComparison", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    807         "fer")]
    808     public enum StringComparison : int
     890    [System.Runtime.Serialization.DataContractAttribute(Name="EqualityComparison", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     891        "fer")]
     892    public enum EqualityComparison : int
    809893    {
    810894       
     
    814898        [System.Runtime.Serialization.EnumMemberAttribute()]
    815899        NotEqual = 1,
    816        
    817         [System.Runtime.Serialization.EnumMemberAttribute()]
    818         Contains = 2,
    819        
    820         [System.Runtime.Serialization.EnumMemberAttribute()]
    821         NotContains = 3,
    822        
    823         [System.Runtime.Serialization.EnumMemberAttribute()]
    824         Like = 4,
    825        
    826         [System.Runtime.Serialization.EnumMemberAttribute()]
    827         NotLike = 5,
    828     }
    829    
    830     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    831     [System.Runtime.Serialization.DataContractAttribute(Name="EqualityComparison", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    832         "fer")]
    833     public enum EqualityComparison : int
    834     {
    835        
    836         [System.Runtime.Serialization.EnumMemberAttribute()]
    837         Equal = 0,
    838        
    839         [System.Runtime.Serialization.EnumMemberAttribute()]
    840         NotEqual = 1,
    841900    }
    842901   
     
    12861345    [System.Runtime.Serialization.DataContractAttribute(Name="Value", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    12871346        "fer")]
     1347    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.BoolValue))]
     1348    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.LongValue))]
     1349    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.IntValue))]
     1350    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.TimeSpanValue))]
     1351    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.FloatValue))]
     1352    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.DoubleValue))]
    12881353    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.StringValue))]
     1354    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.BinaryValue))]
    12891355    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.PercentValue))]
    1290     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.BinaryValue))]
    1291     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.DoubleValue))]
    1292     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.BoolValue))]
    1293     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.IntValue))]
    1294     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.LongValue))]
    1295     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.FloatValue))]
    12961356    public partial class Value : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
    12971357    {
     
    14341494    [System.Diagnostics.DebuggerStepThroughAttribute()]
    14351495    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    1436     [System.Runtime.Serialization.DataContractAttribute(Name="StringValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    1437         "fer")]
    1438     public partial class StringValue : HeuristicLab.Clients.OKB.Query.Value
    1439     {
    1440        
    1441         private string ValueField;
    1442        
    1443         [System.Runtime.Serialization.DataMemberAttribute()]
    1444         public string Value
     1496    [System.Runtime.Serialization.DataContractAttribute(Name="BoolValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     1497        "fer")]
     1498    public partial class BoolValue : HeuristicLab.Clients.OKB.Query.Value
     1499    {
     1500       
     1501        private bool ValueField;
     1502       
     1503        [System.Runtime.Serialization.DataMemberAttribute()]
     1504        public bool Value
    14451505        {
    14461506            get
     
    14501510            set
    14511511            {
    1452                 if ((object.ReferenceEquals(this.ValueField, value) != true))
     1512                if ((this.ValueField.Equals(value) != true))
    14531513                {
    14541514                    this.ValueField = value;
     
    14611521    [System.Diagnostics.DebuggerStepThroughAttribute()]
    14621522    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    1463     [System.Runtime.Serialization.DataContractAttribute(Name="PercentValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    1464         "fer")]
    1465     public partial class PercentValue : HeuristicLab.Clients.OKB.Query.Value
    1466     {
    1467        
    1468         private double ValueField;
    1469        
    1470         [System.Runtime.Serialization.DataMemberAttribute()]
    1471         public double Value
     1523    [System.Runtime.Serialization.DataContractAttribute(Name="LongValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     1524        "fer")]
     1525    public partial class LongValue : HeuristicLab.Clients.OKB.Query.Value
     1526    {
     1527       
     1528        private long ValueField;
     1529       
     1530        [System.Runtime.Serialization.DataMemberAttribute()]
     1531        public long Value
    14721532        {
    14731533            get
     
    14881548    [System.Diagnostics.DebuggerStepThroughAttribute()]
    14891549    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    1490     [System.Runtime.Serialization.DataContractAttribute(Name="BinaryValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    1491         "fer")]
    1492     public partial class BinaryValue : HeuristicLab.Clients.OKB.Query.Value
    1493     {
    1494        
    1495         private byte[] ValueField;
    1496        
    1497         [System.Runtime.Serialization.DataMemberAttribute()]
    1498         public byte[] Value
     1550    [System.Runtime.Serialization.DataContractAttribute(Name="IntValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     1551        "fer")]
     1552    public partial class IntValue : HeuristicLab.Clients.OKB.Query.Value
     1553    {
     1554       
     1555        private int ValueField;
     1556       
     1557        [System.Runtime.Serialization.DataMemberAttribute()]
     1558        public int Value
    14991559        {
    15001560            get
     
    15041564            set
    15051565            {
    1506                 if ((object.ReferenceEquals(this.ValueField, value) != true))
     1566                if ((this.ValueField.Equals(value) != true))
    15071567                {
    15081568                    this.ValueField = value;
     
    15151575    [System.Diagnostics.DebuggerStepThroughAttribute()]
    15161576    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    1517     [System.Runtime.Serialization.DataContractAttribute(Name="DoubleValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    1518         "fer")]
    1519     public partial class DoubleValue : HeuristicLab.Clients.OKB.Query.Value
    1520     {
    1521        
    1522         private double ValueField;
    1523        
    1524         [System.Runtime.Serialization.DataMemberAttribute()]
    1525         public double Value
     1577    [System.Runtime.Serialization.DataContractAttribute(Name="TimeSpanValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     1578        "fer")]
     1579    public partial class TimeSpanValue : HeuristicLab.Clients.OKB.Query.Value
     1580    {
     1581       
     1582        private long ValueField;
     1583       
     1584        [System.Runtime.Serialization.DataMemberAttribute()]
     1585        public long Value
    15261586        {
    15271587            get
     
    15421602    [System.Diagnostics.DebuggerStepThroughAttribute()]
    15431603    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    1544     [System.Runtime.Serialization.DataContractAttribute(Name="BoolValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    1545         "fer")]
    1546     public partial class BoolValue : HeuristicLab.Clients.OKB.Query.Value
    1547     {
    1548        
    1549         private bool ValueField;
    1550        
    1551         [System.Runtime.Serialization.DataMemberAttribute()]
    1552         public bool Value
     1604    [System.Runtime.Serialization.DataContractAttribute(Name="FloatValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     1605        "fer")]
     1606    public partial class FloatValue : HeuristicLab.Clients.OKB.Query.Value
     1607    {
     1608       
     1609        private float ValueField;
     1610       
     1611        [System.Runtime.Serialization.DataMemberAttribute()]
     1612        public float Value
    15531613        {
    15541614            get
     
    15691629    [System.Diagnostics.DebuggerStepThroughAttribute()]
    15701630    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    1571     [System.Runtime.Serialization.DataContractAttribute(Name="IntValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    1572         "fer")]
    1573     public partial class IntValue : HeuristicLab.Clients.OKB.Query.Value
    1574     {
    1575        
    1576         private int ValueField;
    1577        
    1578         [System.Runtime.Serialization.DataMemberAttribute()]
    1579         public int Value
     1631    [System.Runtime.Serialization.DataContractAttribute(Name="DoubleValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     1632        "fer")]
     1633    public partial class DoubleValue : HeuristicLab.Clients.OKB.Query.Value
     1634    {
     1635       
     1636        private double ValueField;
     1637       
     1638        [System.Runtime.Serialization.DataMemberAttribute()]
     1639        public double Value
    15801640        {
    15811641            get
     
    15961656    [System.Diagnostics.DebuggerStepThroughAttribute()]
    15971657    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    1598     [System.Runtime.Serialization.DataContractAttribute(Name="LongValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    1599         "fer")]
    1600     public partial class LongValue : HeuristicLab.Clients.OKB.Query.Value
    1601     {
    1602        
    1603         private long ValueField;
    1604        
    1605         [System.Runtime.Serialization.DataMemberAttribute()]
    1606         public long Value
     1658    [System.Runtime.Serialization.DataContractAttribute(Name="StringValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     1659        "fer")]
     1660    public partial class StringValue : HeuristicLab.Clients.OKB.Query.Value
     1661    {
     1662       
     1663        private string ValueField;
     1664       
     1665        [System.Runtime.Serialization.DataMemberAttribute()]
     1666        public string Value
    16071667        {
    16081668            get
     
    16121672            set
    16131673            {
    1614                 if ((this.ValueField.Equals(value) != true))
     1674                if ((object.ReferenceEquals(this.ValueField, value) != true))
    16151675                {
    16161676                    this.ValueField = value;
     
    16231683    [System.Diagnostics.DebuggerStepThroughAttribute()]
    16241684    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    1625     [System.Runtime.Serialization.DataContractAttribute(Name="FloatValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
    1626         "fer")]
    1627     public partial class FloatValue : HeuristicLab.Clients.OKB.Query.Value
    1628     {
    1629        
    1630         private float ValueField;
    1631        
    1632         [System.Runtime.Serialization.DataMemberAttribute()]
    1633         public float Value
     1685    [System.Runtime.Serialization.DataContractAttribute(Name="BinaryValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     1686        "fer")]
     1687    public partial class BinaryValue : HeuristicLab.Clients.OKB.Query.Value
     1688    {
     1689       
     1690        private byte[] ValueField;
     1691       
     1692        [System.Runtime.Serialization.DataMemberAttribute()]
     1693        public byte[] Value
     1694        {
     1695            get
     1696            {
     1697                return this.ValueField;
     1698            }
     1699            set
     1700            {
     1701                if ((object.ReferenceEquals(this.ValueField, value) != true))
     1702                {
     1703                    this.ValueField = value;
     1704                    this.RaisePropertyChanged("Value");
     1705                }
     1706            }
     1707        }
     1708    }
     1709   
     1710    [System.Diagnostics.DebuggerStepThroughAttribute()]
     1711    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     1712    [System.Runtime.Serialization.DataContractAttribute(Name="PercentValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" +
     1713        "fer")]
     1714    public partial class PercentValue : HeuristicLab.Clients.OKB.Query.Value
     1715    {
     1716       
     1717        private double ValueField;
     1718       
     1719        [System.Runtime.Serialization.DataMemberAttribute()]
     1720        public double Value
    16341721        {
    16351722            get
  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBRun.cs

    r7573 r7574  
    184184          v.Value = ((Data.IntValue)item.Value).Value;
    185185          value = v;
     186        } else if (item.Value is Data.TimeSpanValue) {
     187          TimeSpanValue v = new TimeSpanValue();
     188          v.Value = (long)((Data.TimeSpanValue)item.Value).Value.TotalSeconds;
     189          value = v;
    186190        } else if (item.Value is Data.PercentValue) {
    187191          PercentValue v = new PercentValue();
  • branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/ServiceClient/RunCreationServiceClient.cs

    r7573 r7574  
    653653    [System.Runtime.Serialization.DataContractAttribute(Name="Value", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
    654654        "aTransfer")]
     655    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.BinaryValue))]
     656    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.LongValue))]
    655657    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.FloatValue))]
     658    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.TimeSpanValue))]
     659    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.IntValue))]
     660    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.BoolValue))]
    656661    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.DoubleValue))]
     662    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.PercentValue))]
    657663    [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.StringValue))]
    658     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.PercentValue))]
    659     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.BoolValue))]
    660     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.IntValue))]
    661     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.LongValue))]
    662     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.BinaryValue))]
    663664    public partial class Value : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
    664665    {
     
    730731    [System.Diagnostics.DebuggerStepThroughAttribute()]
    731732    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    732     [System.Runtime.Serialization.DataContractAttribute(Name="FloatValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
    733         "aTransfer")]
    734     public partial class FloatValue : HeuristicLab.Clients.OKB.RunCreation.Value
    735     {
    736        
    737         private float ValueField;
    738        
    739         [System.Runtime.Serialization.DataMemberAttribute()]
    740         public float Value
     733    [System.Runtime.Serialization.DataContractAttribute(Name="BinaryValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
     734        "aTransfer")]
     735    public partial class BinaryValue : HeuristicLab.Clients.OKB.RunCreation.Value
     736    {
     737       
     738        private byte[] ValueField;
     739       
     740        [System.Runtime.Serialization.DataMemberAttribute()]
     741        public byte[] Value
    741742        {
    742743            get
     
    746747            set
    747748            {
    748                 if ((this.ValueField.Equals(value) != true))
     749                if ((object.ReferenceEquals(this.ValueField, value) != true))
    749750                {
    750751                    this.ValueField = value;
     
    757758    [System.Diagnostics.DebuggerStepThroughAttribute()]
    758759    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    759     [System.Runtime.Serialization.DataContractAttribute(Name="DoubleValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
    760         "aTransfer")]
    761     public partial class DoubleValue : HeuristicLab.Clients.OKB.RunCreation.Value
    762     {
    763        
    764         private double ValueField;
    765        
    766         [System.Runtime.Serialization.DataMemberAttribute()]
    767         public double Value
     760    [System.Runtime.Serialization.DataContractAttribute(Name="LongValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
     761        "aTransfer")]
     762    public partial class LongValue : HeuristicLab.Clients.OKB.RunCreation.Value
     763    {
     764       
     765        private long ValueField;
     766       
     767        [System.Runtime.Serialization.DataMemberAttribute()]
     768        public long Value
    768769        {
    769770            get
     
    784785    [System.Diagnostics.DebuggerStepThroughAttribute()]
    785786    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    786     [System.Runtime.Serialization.DataContractAttribute(Name="StringValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
    787         "aTransfer")]
    788     public partial class StringValue : HeuristicLab.Clients.OKB.RunCreation.Value
    789     {
    790        
    791         private string ValueField;
    792        
    793         [System.Runtime.Serialization.DataMemberAttribute()]
    794         public string Value
     787    [System.Runtime.Serialization.DataContractAttribute(Name="FloatValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
     788        "aTransfer")]
     789    public partial class FloatValue : HeuristicLab.Clients.OKB.RunCreation.Value
     790    {
     791       
     792        private float ValueField;
     793       
     794        [System.Runtime.Serialization.DataMemberAttribute()]
     795        public float Value
    795796        {
    796797            get
     
    800801            set
    801802            {
    802                 if ((object.ReferenceEquals(this.ValueField, value) != true))
     803                if ((this.ValueField.Equals(value) != true))
    803804                {
    804805                    this.ValueField = value;
     
    811812    [System.Diagnostics.DebuggerStepThroughAttribute()]
    812813    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    813     [System.Runtime.Serialization.DataContractAttribute(Name="PercentValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
    814         "aTransfer")]
    815     public partial class PercentValue : HeuristicLab.Clients.OKB.RunCreation.Value
    816     {
    817        
    818         private double ValueField;
    819        
    820         [System.Runtime.Serialization.DataMemberAttribute()]
    821         public double Value
     814    [System.Runtime.Serialization.DataContractAttribute(Name="TimeSpanValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
     815        "aTransfer")]
     816    public partial class TimeSpanValue : HeuristicLab.Clients.OKB.RunCreation.Value
     817    {
     818       
     819        private long ValueField;
     820       
     821        [System.Runtime.Serialization.DataMemberAttribute()]
     822        public long Value
    822823        {
    823824            get
     
    838839    [System.Diagnostics.DebuggerStepThroughAttribute()]
    839840    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    840     [System.Runtime.Serialization.DataContractAttribute(Name="BoolValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
    841         "aTransfer")]
    842     public partial class BoolValue : HeuristicLab.Clients.OKB.RunCreation.Value
    843     {
    844        
    845         private bool ValueField;
    846        
    847         [System.Runtime.Serialization.DataMemberAttribute()]
    848         public bool Value
     841    [System.Runtime.Serialization.DataContractAttribute(Name="IntValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
     842        "aTransfer")]
     843    public partial class IntValue : HeuristicLab.Clients.OKB.RunCreation.Value
     844    {
     845       
     846        private int ValueField;
     847       
     848        [System.Runtime.Serialization.DataMemberAttribute()]
     849        public int Value
    849850        {
    850851            get
     
    865866    [System.Diagnostics.DebuggerStepThroughAttribute()]
    866867    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    867     [System.Runtime.Serialization.DataContractAttribute(Name="IntValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
    868         "aTransfer")]
    869     public partial class IntValue : HeuristicLab.Clients.OKB.RunCreation.Value
    870     {
    871        
    872         private int ValueField;
    873        
    874         [System.Runtime.Serialization.DataMemberAttribute()]
    875         public int Value
     868    [System.Runtime.Serialization.DataContractAttribute(Name="BoolValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
     869        "aTransfer")]
     870    public partial class BoolValue : HeuristicLab.Clients.OKB.RunCreation.Value
     871    {
     872       
     873        private bool ValueField;
     874       
     875        [System.Runtime.Serialization.DataMemberAttribute()]
     876        public bool Value
    876877        {
    877878            get
     
    892893    [System.Diagnostics.DebuggerStepThroughAttribute()]
    893894    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    894     [System.Runtime.Serialization.DataContractAttribute(Name="LongValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
    895         "aTransfer")]
    896     public partial class LongValue : HeuristicLab.Clients.OKB.RunCreation.Value
    897     {
    898        
    899         private long ValueField;
    900        
    901         [System.Runtime.Serialization.DataMemberAttribute()]
    902         public long Value
     895    [System.Runtime.Serialization.DataContractAttribute(Name="DoubleValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
     896        "aTransfer")]
     897    public partial class DoubleValue : HeuristicLab.Clients.OKB.RunCreation.Value
     898    {
     899       
     900        private double ValueField;
     901       
     902        [System.Runtime.Serialization.DataMemberAttribute()]
     903        public double Value
    903904        {
    904905            get
     
    919920    [System.Diagnostics.DebuggerStepThroughAttribute()]
    920921    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    921     [System.Runtime.Serialization.DataContractAttribute(Name="BinaryValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
    922         "aTransfer")]
    923     public partial class BinaryValue : HeuristicLab.Clients.OKB.RunCreation.Value
    924     {
    925        
    926         private byte[] ValueField;
    927        
    928         [System.Runtime.Serialization.DataMemberAttribute()]
    929         public byte[] Value
     922    [System.Runtime.Serialization.DataContractAttribute(Name="PercentValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
     923        "aTransfer")]
     924    public partial class PercentValue : HeuristicLab.Clients.OKB.RunCreation.Value
     925    {
     926       
     927        private double ValueField;
     928       
     929        [System.Runtime.Serialization.DataMemberAttribute()]
     930        public double Value
     931        {
     932            get
     933            {
     934                return this.ValueField;
     935            }
     936            set
     937            {
     938                if ((this.ValueField.Equals(value) != true))
     939                {
     940                    this.ValueField = value;
     941                    this.RaisePropertyChanged("Value");
     942                }
     943            }
     944        }
     945    }
     946   
     947    [System.Diagnostics.DebuggerStepThroughAttribute()]
     948    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     949    [System.Runtime.Serialization.DataContractAttribute(Name="StringValue", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" +
     950        "aTransfer")]
     951    public partial class StringValue : HeuristicLab.Clients.OKB.RunCreation.Value
     952    {
     953       
     954        private string ValueField;
     955       
     956        [System.Runtime.Serialization.DataMemberAttribute()]
     957        public string Value
    930958        {
    931959            get
  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataAccess/3.3/ValueNameType.cs

    r7573 r7574  
    2929    String = 5,
    3030    Binary = 6,
    31     Percent = 7
     31    Percent = 7,
     32    TimeSpan = 8
    3233  }
    3334}
  • 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.