Changeset 7574 for branches/OKB (trunk integration)
- Timestamp:
- 03/06/12 20:21:07 (12 years ago)
- 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 206 206 <Compile Include="Query\QueryMenuItem.cs" /> 207 207 <Compile Include="Query\ServiceClient\CombinedFilter.cs" /> 208 <Compile Include="Query\ServiceClient\OrdinalComparisonTimeSpanFilter.cs" /> 209 <Compile Include="Query\ServiceClient\NameOrdinalComparisonTimeSpanFilter.cs" /> 208 210 <Compile Include="Query\ServiceClient\OrdinalComparisonPercentFilter.cs" /> 209 211 <Compile Include="Query\ServiceClient\NameOrdinalComparisonPercentFilter.cs" /> … … 233 235 <DependentUpon>CombinedFilterView.cs</DependentUpon> 234 236 </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> 235 243 <Compile Include="Query\Views\OrdinalComparisonPercentFilterView.cs"> 236 244 <SubType>UserControl</SubType> -
branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/Query/ServiceClient/QueryServiceClient.cs
r7573 r7574 18 18 [System.Runtime.Serialization.DataContractAttribute(Name="Filter", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" + 19 19 "fer")] 20 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.CombinedFilter))]21 20 [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))] 22 23 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonLongFilter))] 23 24 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonLongFilter))] 25 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonDateTimeFilter))] 24 26 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonIntFilter))] 25 27 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonIntFilter))] … … 30 32 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonPercentFilter))] 31 33 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonPercentFilter))] 32 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonDateTimeFilter))]33 34 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.StringComparisonFilter))] 34 35 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.StringComparisonAvailableValuesFilter))] 35 36 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameStringComparisonAvailableValuesFilter))] 36 37 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameStringComparisonFilter))] 38 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.CombinedFilter))] 37 39 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.EqualityComparisonFilter))] 38 40 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.EqualityComparisonBoolFilter))] … … 109 111 [System.Diagnostics.DebuggerStepThroughAttribute()] 110 112 [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.Filter114 {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> Filters122 {123 get124 {125 return this.FiltersField;126 }127 set128 {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 Operation139 {140 get141 {142 return this.OperationField;143 }144 set145 {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")]157 113 [System.Runtime.Serialization.DataContractAttribute(Name="OrdinalComparisonFilter", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" + 158 114 "fer")] 115 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonTimeSpanFilter))] 116 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonTimeSpanFilter))] 159 117 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonLongFilter))] 160 118 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonLongFilter))] 119 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonDateTimeFilter))] 161 120 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonIntFilter))] 162 121 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonIntFilter))] … … 167 126 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonPercentFilter))] 168 127 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.NameOrdinalComparisonPercentFilter))] 169 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.OrdinalComparisonDateTimeFilter))]170 128 public partial class OrdinalComparisonFilter : HeuristicLab.Clients.OKB.Query.Filter 171 129 { … … 193 151 [System.Diagnostics.DebuggerStepThroughAttribute()] 194 152 [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")] 195 208 [System.Runtime.Serialization.DataContractAttribute(Name="OrdinalComparisonLongFilter", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" + 196 209 "fer")] … … 248 261 [System.Diagnostics.DebuggerStepThroughAttribute()] 249 262 [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")] 250 290 [System.Runtime.Serialization.DataContractAttribute(Name="OrdinalComparisonIntFilter", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" + 251 291 "fer")] … … 461 501 this.NameField = value; 462 502 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.OrdinalComparisonFilter473 {474 475 private System.DateTime ValueField;476 477 [System.Runtime.Serialization.DataMemberAttribute()]478 public System.DateTime Value479 {480 get481 {482 return this.ValueField;483 }484 set485 {486 if ((this.ValueField.Equals(value) != true))487 {488 this.ValueField = value;489 this.RaisePropertyChanged("Value");490 503 } 491 504 } … … 619 632 this.NameField = value; 620 633 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"); 621 680 } 622 681 } … … 766 825 767 826 [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")] 768 877 [System.Runtime.Serialization.DataContractAttribute(Name="BooleanOperation", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" + 769 878 "fer")] … … 779 888 780 889 [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 809 893 { 810 894 … … 814 898 [System.Runtime.Serialization.EnumMemberAttribute()] 815 899 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 : int834 {835 836 [System.Runtime.Serialization.EnumMemberAttribute()]837 Equal = 0,838 839 [System.Runtime.Serialization.EnumMemberAttribute()]840 NotEqual = 1,841 900 } 842 901 … … 1286 1345 [System.Runtime.Serialization.DataContractAttribute(Name="Value", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.Query.DataTrans" + 1287 1346 "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))] 1288 1353 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.StringValue))] 1354 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.Query.BinaryValue))] 1289 1355 [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))]1296 1356 public partial class Value : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged 1297 1357 { … … 1434 1494 [System.Diagnostics.DebuggerStepThroughAttribute()] 1435 1495 [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.Value1439 { 1440 1441 private stringValueField;1442 1443 [System.Runtime.Serialization.DataMemberAttribute()] 1444 public stringValue1496 [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 1445 1505 { 1446 1506 get … … 1450 1510 set 1451 1511 { 1452 if (( object.ReferenceEquals(this.ValueField,value) != true))1512 if ((this.ValueField.Equals(value) != true)) 1453 1513 { 1454 1514 this.ValueField = value; … … 1461 1521 [System.Diagnostics.DebuggerStepThroughAttribute()] 1462 1522 [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.Value1466 { 1467 1468 private doubleValueField;1469 1470 [System.Runtime.Serialization.DataMemberAttribute()] 1471 public doubleValue1523 [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 1472 1532 { 1473 1533 get … … 1488 1548 [System.Diagnostics.DebuggerStepThroughAttribute()] 1489 1549 [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.Value1493 { 1494 1495 private byte[]ValueField;1496 1497 [System.Runtime.Serialization.DataMemberAttribute()] 1498 public byte[]Value1550 [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 1499 1559 { 1500 1560 get … … 1504 1564 set 1505 1565 { 1506 if (( object.ReferenceEquals(this.ValueField,value) != true))1566 if ((this.ValueField.Equals(value) != true)) 1507 1567 { 1508 1568 this.ValueField = value; … … 1515 1575 [System.Diagnostics.DebuggerStepThroughAttribute()] 1516 1576 [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.Value1520 { 1521 1522 private doubleValueField;1523 1524 [System.Runtime.Serialization.DataMemberAttribute()] 1525 public doubleValue1577 [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 1526 1586 { 1527 1587 get … … 1542 1602 [System.Diagnostics.DebuggerStepThroughAttribute()] 1543 1603 [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.Value1547 { 1548 1549 private boolValueField;1550 1551 [System.Runtime.Serialization.DataMemberAttribute()] 1552 public boolValue1604 [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 1553 1613 { 1554 1614 get … … 1569 1629 [System.Diagnostics.DebuggerStepThroughAttribute()] 1570 1630 [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.Value1574 { 1575 1576 private intValueField;1577 1578 [System.Runtime.Serialization.DataMemberAttribute()] 1579 public intValue1631 [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 1580 1640 { 1581 1641 get … … 1596 1656 [System.Diagnostics.DebuggerStepThroughAttribute()] 1597 1657 [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.Value1601 { 1602 1603 private long ValueField;1604 1605 [System.Runtime.Serialization.DataMemberAttribute()] 1606 public long Value1658 [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 1607 1667 { 1608 1668 get … … 1612 1672 set 1613 1673 { 1614 if (( this.ValueField.Equals(value) != true))1674 if ((object.ReferenceEquals(this.ValueField, value) != true)) 1615 1675 { 1616 1676 this.ValueField = value; … … 1623 1683 [System.Diagnostics.DebuggerStepThroughAttribute()] 1624 1684 [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 1634 1721 { 1635 1722 get -
branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/OKBRun.cs
r7573 r7574 184 184 v.Value = ((Data.IntValue)item.Value).Value; 185 185 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; 186 190 } else if (item.Value is Data.PercentValue) { 187 191 PercentValue v = new PercentValue(); -
branches/OKB (trunk integration)/HeuristicLab.Clients.OKB/3.3/RunCreation/ServiceClient/RunCreationServiceClient.cs
r7573 r7574 653 653 [System.Runtime.Serialization.DataContractAttribute(Name="Value", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.OKB.RunCreation.Dat" + 654 654 "aTransfer")] 655 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.BinaryValue))] 656 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.LongValue))] 655 657 [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))] 656 661 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.DoubleValue))] 662 [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.OKB.RunCreation.PercentValue))] 657 663 [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))]663 664 public partial class Value : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged 664 665 { … … 730 731 [System.Diagnostics.DebuggerStepThroughAttribute()] 731 732 [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.Value735 { 736 737 private floatValueField;738 739 [System.Runtime.Serialization.DataMemberAttribute()] 740 public floatValue733 [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 741 742 { 742 743 get … … 746 747 set 747 748 { 748 if (( this.ValueField.Equals(value) != true))749 if ((object.ReferenceEquals(this.ValueField, value) != true)) 749 750 { 750 751 this.ValueField = value; … … 757 758 [System.Diagnostics.DebuggerStepThroughAttribute()] 758 759 [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.Value762 { 763 764 private doubleValueField;765 766 [System.Runtime.Serialization.DataMemberAttribute()] 767 public doubleValue760 [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 768 769 { 769 770 get … … 784 785 [System.Diagnostics.DebuggerStepThroughAttribute()] 785 786 [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.Value789 { 790 791 private stringValueField;792 793 [System.Runtime.Serialization.DataMemberAttribute()] 794 public stringValue787 [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 795 796 { 796 797 get … … 800 801 set 801 802 { 802 if (( object.ReferenceEquals(this.ValueField,value) != true))803 if ((this.ValueField.Equals(value) != true)) 803 804 { 804 805 this.ValueField = value; … … 811 812 [System.Diagnostics.DebuggerStepThroughAttribute()] 812 813 [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.Value816 { 817 818 private doubleValueField;819 820 [System.Runtime.Serialization.DataMemberAttribute()] 821 public doubleValue814 [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 822 823 { 823 824 get … … 838 839 [System.Diagnostics.DebuggerStepThroughAttribute()] 839 840 [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.Value843 { 844 845 private boolValueField;846 847 [System.Runtime.Serialization.DataMemberAttribute()] 848 public boolValue841 [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 849 850 { 850 851 get … … 865 866 [System.Diagnostics.DebuggerStepThroughAttribute()] 866 867 [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.Value870 { 871 872 private intValueField;873 874 [System.Runtime.Serialization.DataMemberAttribute()] 875 public intValue868 [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 876 877 { 877 878 get … … 892 893 [System.Diagnostics.DebuggerStepThroughAttribute()] 893 894 [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.Value897 { 898 899 private longValueField;900 901 [System.Runtime.Serialization.DataMemberAttribute()] 902 public longValue895 [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 903 904 { 904 905 get … … 919 920 [System.Diagnostics.DebuggerStepThroughAttribute()] 920 921 [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 930 958 { 931 959 get -
branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataAccess/3.3/ValueNameType.cs
r7573 r7574 29 29 String = 5, 30 30 Binary = 6, 31 Percent = 7 31 Percent = 7, 32 TimeSpan = 8 32 33 } 33 34 } -
branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj
r7573 r7574 147 147 <Compile Include="Query\DataTransfer\BoolValue.cs" /> 148 148 <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" /> 149 152 <Compile Include="Query\DataTransfer\OrdinalComparisonPercentFilter.cs" /> 150 153 <Compile Include="Query\DataTransfer\NameOrdinalComparisonPercentFilter.cs" /> … … 195 198 <Compile Include="Query\Filters\BoolValueFilter.cs" /> 196 199 <Compile Include="Query\Filters\BinaryValueFilter.cs" /> 200 <Compile Include="Query\Filters\TimeSpanValueFilter.cs" /> 197 201 <Compile Include="Query\Filters\PercentValueFilter.cs" /> 198 202 <Compile Include="Query\Filters\StringValueFilter.cs" /> … … 237 241 <Compile Include="RunCreation\DataTransfer\BinaryValue.cs" /> 238 242 <Compile Include="RunCreation\DataTransfer\BoolValue.cs" /> 243 <Compile Include="RunCreation\DataTransfer\TimeSpanValue.cs" /> 239 244 <Compile Include="RunCreation\DataTransfer\PercentValue.cs" /> 240 245 <Compile Include="RunCreation\DataTransfer\DataType.cs" /> -
branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Convert.cs
r7573 r7574 56 56 } else if (source.ValueName.Type == DA.ValueNameType.Int) { 57 57 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() }; 58 60 } else if (source.ValueName.Type == DA.ValueNameType.Long) { 59 61 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 36 36 [KnownType(typeof(NameOrdinalComparisonIntFilter))] 37 37 [KnownType(typeof(NameOrdinalComparisonLongFilter))] 38 [KnownType(typeof(NameOrdinalComparisonTimeSpanFilter))] 38 39 [KnownType(typeof(NameStringComparisonFilter))] 39 40 [KnownType(typeof(NameStringComparisonAvailableValuesFilter))] -
branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/DataTransfer/Value.cs
r7573 r7574 32 32 [KnownType(typeof(BinaryValue))] 33 33 [KnownType(typeof(PercentValue))] 34 [KnownType(typeof(TimeSpanValue))] 34 35 public abstract class Value { 35 36 [DataMember] -
branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/QueryService.cs
r7573 r7574 75 75 name 76 76 )); 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 )); 77 83 foreach (string name in okb.ValueNames.Where(x => (x.Category == ValueNameCategory.Parameter) && (x.Type == ValueNameType.Float)).Select(x => x.Name).Distinct()) 78 84 filters.Add(new NameOrdinalComparisonFloatFilter( … … 138 144 name 139 145 )); 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 )); 140 152 foreach (string name in okb.ValueNames.Where(x => (x.Category == ValueNameCategory.Result) && (x.Type == ValueNameType.Float)).Select(x => x.Name).Distinct()) 141 153 filters.Add(new NameOrdinalComparisonFloatFilter( -
branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/RunCreation/Convert.cs
r7573 r7574 77 77 entity.ValueName = Convert.ToEntity(source.Name, category, DA.ValueNameType.Int, okb); 78 78 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; 79 82 } else if (source is DT.LongValue) { 80 83 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 32 32 [KnownType(typeof(BinaryValue))] 33 33 [KnownType(typeof(PercentValue))] 34 [KnownType(typeof(TimeSpanValue))] 34 35 public abstract class Value { 35 36 [DataMember]
Note: See TracChangeset
for help on using the changeset viewer.