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

Timestamp:

02/16/11 04:59:43 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

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

Files:

• DataTransfer/Algorithm.cs (added)
• DataTransfer/AlgorithmClass.cs (added)
• DataTransfer/BinaryValue.cs (added)
• DataTransfer/BoolValue.cs (added)
• DataTransfer/BooleanOperation.cs (added)
• DataTransfer/CombinedFilter.cs (added)
• DataTransfer/DataType.cs (added)
• DataTransfer/DoubleValue.cs (added)
• DataTransfer/EqualityComparison.cs (added)
• DataTransfer/EqualityComparisonFilter.cs (added)
• DataTransfer/Filter.cs (added)
• DataTransfer/FloatValue.cs (added)
• DataTransfer/IntValue.cs (added)
• DataTransfer/LongValue.cs (added)
• DataTransfer/NameEqualityComparisonBoolFilter.cs (added)
• DataTransfer/NameEqualityComparisonByteArrayFilter.cs (added)
• DataTransfer/NameOrdinalComparisonDoubleFilter.cs (added)
• DataTransfer/NameOrdinalComparisonFloatFilter.cs (added)
• DataTransfer/NameOrdinalComparisonIntFilter.cs (added)
• DataTransfer/NameOrdinalComparisonLongFilter.cs (added)
• DataTransfer/NameStringComparisonAvailableValuesFilter.cs (added)
• DataTransfer/NameStringComparisonFilter.cs (added)
• DataTransfer/OrdinalComparison.cs (added)
• DataTransfer/OrdinalComparisonDateTimeFilter.cs (added)
• DataTransfer/OrdinalComparisonFilter.cs (added)
• DataTransfer/OrdinalComparisonIntFilter.cs (added)
• DataTransfer/OrdinalComparisonLongFilter.cs (added)
• DataTransfer/Platform.cs (added)
• DataTransfer/Problem.cs (added)
• DataTransfer/ProblemClass.cs (added)
• DataTransfer/Run.cs (added)
• DataTransfer/StringComparison.cs (added)
• DataTransfer/StringComparisonAvailableValuesFilter.cs (added)
• DataTransfer/StringComparisonFilter.cs (added)
• DataTransfer/StringValue.cs (added)
• DataTransfer/Value.cs (added)
• Filters/AlgorithmClassNameFilter.cs (modified) (1 diff)
• Filters/AlgorithmDataDataTypeNameFilter.cs (modified) (1 diff)
• Filters/AlgorithmNameFilter.cs (modified) (1 diff)
• Filters/AlgorithmParameterBlobValueDataTypeNameFilter.cs (modified) (1 diff)
• Filters/AlgorithmParameterBlobValueValueFilter.cs (modified) (1 diff)
• Filters/AlgorithmParameterBoolValueValueFilter.cs (modified) (1 diff)
• Filters/AlgorithmParameterFloatValueValueFilter.cs (modified) (1 diff)
• Filters/AlgorithmParameterIntValueValueFilter.cs (modified) (1 diff)
• Filters/AlgorithmParameterNameFilter.cs (modified) (1 diff)
• Filters/AlgorithmParameterStringValueValueFilter.cs (modified) (1 diff)
• Filters/AlgorithmPlatformNameFilter.cs (modified) (1 diff)
• Filters/AndFilter.cs (modified) (1 diff)
• Filters/IFilter.cs (moved) (moved from branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/IFilter.cs) (1 diff)
• Filters/OrFilter.cs (modified) (1 diff)
• Filters/ProblemClassNameFilter.cs (modified) (1 diff)
• Filters/ProblemDataDataTypeNameFilter.cs (modified) (1 diff)
• Filters/ProblemNameFilter.cs (modified) (1 diff)
• Filters/ProblemParameterBlobValueDataTypeNameFilter.cs (modified) (1 diff)
• IQueryService.cs (modified) (2 diffs)
• QueryService.cs (modified) (4 diffs)

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/AlgorithmClassNameFilter.cs

@@ -24 +24 @@
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class AlgorithmClassNameFilter : IFilter {
     public DataTransfer.StringComparison Comparison { get; set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/AlgorithmDataDataTypeNameFilter.cs

@@ -24 +24 @@
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class AlgorithmDataDataTypeNameFilter : IFilter {
     public DataTransfer.StringComparison Comparison { get; set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/AlgorithmNameFilter.cs

@@ -24 +24 @@
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class AlgorithmNameFilter : IFilter {
     public DataTransfer.StringComparison Comparison { get; set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/AlgorithmParameterBlobValueDataTypeNameFilter.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using System.Linq.Expressions;
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class AlgorithmParameterBlobValueDataTypeNameFilter : IFilter {
     public string Name { get; protected set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/AlgorithmParameterBlobValueValueFilter.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using System.Linq.Expressions;
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class AlgorithmParameterBlobValueValueFilter : IFilter {
     public string Name { get; protected set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/AlgorithmParameterBoolValueValueFilter.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using System.Linq.Expressions;
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class AlgorithmParameterBoolValueValueFilter : IFilter {
     public string Name { get; protected set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/AlgorithmParameterFloatValueValueFilter.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using System.Linq.Expressions;
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class AlgorithmParameterFloatValueValueFilter : IFilter {
     public string Name { get; protected set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/AlgorithmParameterIntValueValueFilter.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using System.Linq.Expressions;
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class AlgorithmParameterIntValueValueFilter : IFilter {
     public string Name { get; protected set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/AlgorithmParameterNameFilter.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using System.Linq.Expressions;
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class AlgorithmParameterNameFilter : IFilter {
     public DataTransfer.StringComparison Comparison { get; set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/AlgorithmParameterStringValueValueFilter.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using System.Linq.Expressions;
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class AlgorithmParameterStringValueValueFilter : IFilter {
     public string Name { get; protected set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/AlgorithmPlatformNameFilter.cs

@@ -24 +24 @@
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class AlgorithmPlatformNameFilter : IFilter {
     public DataTransfer.StringComparison Comparison { get; set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/AndFilter.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class AndFilter : IFilter {
     public List<IFilter> Filters { get; private set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/IFilter.cs

@@ -24 +24 @@
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB.Query {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public interface IFilter {
     Expression<Func<Run, bool>> Expression { get; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/OrFilter.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Linq.Expressions;
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class OrFilter : IFilter {
     public List<IFilter> Filters { get; private set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/ProblemClassNameFilter.cs

@@ -24 +24 @@
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class ProblemClassNameFilter : IFilter {
     public DataTransfer.StringComparison Comparison { get; set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/ProblemDataDataTypeNameFilter.cs

@@ -24 +24 @@
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class ProblemDataDataTypeNameFilter : IFilter {
     public DataTransfer.StringComparison Comparison { get; set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/ProblemNameFilter.cs

@@ -24 +24 @@
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class ProblemNameFilter : IFilter {
     public DataTransfer.StringComparison Comparison { get; set; }

branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/Query/Filters/ProblemParameterBlobValueDataTypeNameFilter.cs

@@ -21 +21 @@
 
 using System;
-using System.Linq;
 using System.Linq.Expressions;
 using HeuristicLab.Services.OKB.DataAccess;
 
-namespace HeuristicLab.Services.OKB {
+namespace HeuristicLab.Services.OKB.Query.Filters {
   public class ProblemParameterBlobValueDataTypeNameFilter : IFilter {
     public string Name { get; protected set; }

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

@@ -23 +23 @@
 using System.Net.Security;
 using System.ServiceModel;
-using HeuristicLab.Services.OKB.DataTransfer;
+using HeuristicLab.Services.OKB.Query.DataTransfer;
 
 namespace HeuristicLab.Services.OKB.Query {
@@ -35 +35 @@
 
     [OperationContract]
-    long GetNumberOfQueryResults(Filter filter);
+    long GetNumberOfRuns(Filter filter);
 
     [OperationContract]
-    IEnumerable<long> GetQueryResultIds(Filter filter);
+    IEnumerable<long> GetRunIds(Filter filter);
 
     [OperationContract]
-    IEnumerable<QueryResult> GetQueryResults(IEnumerable<long> ids);
+    IEnumerable<Run> GetRuns(IEnumerable<long> ids);
   }
 }

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

@@ -26 +26 @@
 using System.ServiceModel;
 using HeuristicLab.Services.OKB.DataAccess;
-using HeuristicLab.Services.OKB.DataTransfer;
+using HeuristicLab.Services.OKB.Query.DataTransfer;
 
 namespace HeuristicLab.Services.OKB.Query {
@@ -107 +107 @@
     }
 
-    public long GetNumberOfQueryResults(Filter filter) {
+    public long GetNumberOfRuns(Filter filter) {
       using (OKBDataContext okb = new OKBDataContext()) {
         return FilterRuns(okb.Runs, filter).LongCount();
@@ -113 +113 @@
     }
 
-    public IEnumerable<long> GetQueryResultIds(Filter filter) {
+    public IEnumerable<long> GetRunIds(Filter filter) {
       using (OKBDataContext okb = new OKBDataContext()) {
         return FilterRuns(okb.Runs, filter).Select(x => x.Id).ToArray();
@@ -119 +119 @@
     }
 
-    public IEnumerable<QueryResult> GetQueryResults(IEnumerable<long> ids) {
+    public IEnumerable<DataTransfer.Run> GetRuns(IEnumerable<long> ids) {
       using (OKBDataContext okb = new OKBDataContext()) {
         DataLoadOptions dlo = new DataLoadOptions();