Changeset 5304 for branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataTransfer/3.3

Timestamp:

01/17/11 05:03:21 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

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

Files:

• Filters/AndFilter.cs (deleted)
• Filters/BooleanOperation.cs (added)
• Filters/CombinedFilter.cs (modified) (1 diff)
• Filters/Filter.cs (modified) (1 diff)
• Filters/OrFilter.cs (deleted)
• HeuristicLab.Services.OKB.DataTransfer-3.3.csproj (modified) (1 diff)
• QueryBlobValue.cs (added)
• QueryBoolValue.cs (added)
• QueryFloatValue.cs (added)
• QueryIntValue.cs (added)
• QueryResult.cs (added)
• QueryStringValue.cs (added)
• QueryValue.cs (added)

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

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using System.Linq;
 using System.Runtime.Serialization;
 
 namespace HeuristicLab.Services.OKB.DataTransfer {
   [DataContract]
-  public abstract class CombinedFilter : Filter {
+  public class CombinedFilter : Filter {
+    [DataMember]
+    public BooleanOperation Operation { get; protected set; }
     [DataMember]
     public IEnumerable<Filter> Filters { get; set; }
+
+    public CombinedFilter(string filterTypeName, string label, BooleanOperation operation) {
+      FilterTypeName = filterTypeName;
+      Label = label;
+      Operation = operation;
+      Filters = Enumerable.Empty<Filter>();
+    }
   }
 }

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

@@ -34 +34 @@
   [KnownType(typeof(NameSetComparisonStringFilter))]
   [KnownType(typeof(NameSetComparisonStringAvailableValuesFilter))]
-  [KnownType(typeof(AndFilter))]
-  [KnownType(typeof(OrFilter))]
+  [KnownType(typeof(CombinedFilter))]
   public abstract class Filter {
     [DataMember]

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

@@ -58 +58 @@
     <Compile Include="AlgorithmParameterIntValue.cs" />
     <Compile Include="AlgorithmParameterStringValue.cs" />
+    <Compile Include="Filters\BooleanOperation.cs" />
+    <Compile Include="QueryBoolValue.cs" />
+    <Compile Include="QueryBlobValue.cs" />
+    <Compile Include="QueryFloatValue.cs" />
+    <Compile Include="QueryIntValue.cs" />
+    <Compile Include="QueryStringValue.cs" />
+    <Compile Include="QueryValue.cs" />
+    <Compile Include="QueryResult.cs" />
     <Compile Include="Filters\CombinedFilter.cs" />
-    <Compile Include="Filters\AndFilter.cs" />
     <Compile Include="Filters\NameSetComparisonStringAvailableValuesFilter.cs" />
     <Compile Include="Filters\SetComparisonStringAvailableValuesFilter.cs" />
-    <Compile Include="Filters\OrFilter.cs" />
     <Compile Include="Filters\OrdinalComparisonFilter.cs" />
     <Compile Include="Filters\SetComparisonFilter.cs" />