Changeset 5608 for branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query

Timestamp:

03/04/11 16:07:41 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

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

Files:

• EqualityComparisonBoolFilter.cs (added)
• EqualityComparisonByteArrayFilter.cs (added)
• NameEqualityComparisonBoolFilter.cs (modified) (1 diff)
• NameEqualityComparisonByteArrayFilter.cs (modified) (1 diff)
• NameOrdinalComparisonDoubleFilter.cs (modified) (1 diff)
• NameOrdinalComparisonFloatFilter.cs (modified) (1 diff)
• NameOrdinalComparisonIntFilter.cs (modified) (1 diff)
• NameOrdinalComparisonLongFilter.cs (modified) (1 diff)
• NameStringComparisonAvailableValuesFilter.cs (modified) (1 diff)
• OrdinalComparisonDoubleFilter.cs (added)
• OrdinalComparisonFloatFilter.cs (added)

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

@@ -24 +24 @@
 namespace HeuristicLab.Services.OKB.Query.DataTransfer {
   [DataContract]
-  public class NameEqualityComparisonBoolFilter : EqualityComparisonFilter {
+  public class NameEqualityComparisonBoolFilter : EqualityComparisonBoolFilter {
     [DataMember]
     public string Name { get; protected set; }
-    [DataMember]
-    public bool Value { get; set; }
 
-    public NameEqualityComparisonBoolFilter(string filterTypeName, string label, string name) {
-      FilterTypeName = filterTypeName;
-      Label = label;
+    public NameEqualityComparisonBoolFilter(string filterTypeName, string label, string name)
+      : base(filterTypeName, label) {
       Name = name;
     }

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

@@ -24 +24 @@
 namespace HeuristicLab.Services.OKB.Query.DataTransfer {
   [DataContract]
-  public class NameEqualityComparisonByteArrayFilter : EqualityComparisonFilter {
+  public class NameEqualityComparisonByteArrayFilter : EqualityComparisonByteArrayFilter {
     [DataMember]
     public string Name { get; protected set; }
-    [DataMember]
-    public byte[] Value { get; set; }
 
-    public NameEqualityComparisonByteArrayFilter(string filterTypeName, string label, string name) {
-      FilterTypeName = filterTypeName;
-      Label = label;
+    public NameEqualityComparisonByteArrayFilter(string filterTypeName, string label, string name)
+      : base(filterTypeName, label) {
       Name = name;
     }

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

@@ -24 +24 @@
 namespace HeuristicLab.Services.OKB.Query.DataTransfer {
   [DataContract]
-  public class NameOrdinalComparisonDoubleFilter : OrdinalComparisonFilter {
+  public class NameOrdinalComparisonDoubleFilter : OrdinalComparisonDoubleFilter {
     [DataMember]
     public string Name { get; protected set; }
-    [DataMember]
-    public double Value { get; set; }
 
-    public NameOrdinalComparisonDoubleFilter(string filterTypeName, string label, string name) {
-      FilterTypeName = filterTypeName;
-      Label = label;
+    public NameOrdinalComparisonDoubleFilter(string filterTypeName, string label, string name)
+      : base(filterTypeName, label) {
       Name = name;
     }

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

@@ -24 +24 @@
 namespace HeuristicLab.Services.OKB.Query.DataTransfer {
   [DataContract]
-  public class NameOrdinalComparisonFloatFilter : OrdinalComparisonFilter {
+  public class NameOrdinalComparisonFloatFilter : OrdinalComparisonFloatFilter {
     [DataMember]
     public string Name { get; protected set; }
-    [DataMember]
-    public float Value { get; set; }
 
-    public NameOrdinalComparisonFloatFilter(string filterTypeName, string label, string name) {
-      FilterTypeName = filterTypeName;
-      Label = label;
+    public NameOrdinalComparisonFloatFilter(string filterTypeName, string label, string name)
+      : base(filterTypeName, label) {
       Name = name;
     }

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

@@ -24 +24 @@
 namespace HeuristicLab.Services.OKB.Query.DataTransfer {
   [DataContract]
-  public class NameOrdinalComparisonIntFilter : OrdinalComparisonFilter {
+  public class NameOrdinalComparisonIntFilter : OrdinalComparisonIntFilter {
     [DataMember]
     public string Name { get; protected set; }
-    [DataMember]
-    public int Value { get; set; }
 
-    public NameOrdinalComparisonIntFilter(string filterTypeName, string label, string name) {
-      FilterTypeName = filterTypeName;
-      Label = label;
+    public NameOrdinalComparisonIntFilter(string filterTypeName, string label, string name)
+      : base(filterTypeName, label) {
       Name = name;
     }

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

@@ -24 +24 @@
 namespace HeuristicLab.Services.OKB.Query.DataTransfer {
   [DataContract]
-  public class NameOrdinalComparisonLongFilter : OrdinalComparisonFilter {
+  public class NameOrdinalComparisonLongFilter : OrdinalComparisonLongFilter {
     [DataMember]
     public string Name { get; protected set; }
-    [DataMember]
-    public long Value { get; set; }
 
-    public NameOrdinalComparisonLongFilter(string filterTypeName, string label, string name) {
-      FilterTypeName = filterTypeName;
-      Label = label;
+    public NameOrdinalComparisonLongFilter(string filterTypeName, string label, string name)
+      : base(filterTypeName, label) {
       Name = name;
     }

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

@@ -25 +25 @@
 namespace HeuristicLab.Services.OKB.Query.DataTransfer {
   [DataContract]
-  public class NameStringComparisonAvailableValuesFilter : NameStringComparisonFilter {
+  public class NameStringComparisonAvailableValuesFilter : StringComparisonAvailableValuesFilter {
     [DataMember]
-    public IEnumerable<string> AvailableValues { get; protected set; }
+    public string Name { get; protected set; }
 
     public NameStringComparisonAvailableValuesFilter(string filterTypeName, string label, string name, IEnumerable<string> availableValues)
-      : base(filterTypeName, label, name) {
-      AvailableValues = availableValues;
+      : base(filterTypeName, label, availableValues) {
+      Name = name;
     }
   }