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

Timestamp:

03/08/12 20:44:53 (13 years ago)

Author:

ascheibe

Message:

#1174 values of returned runs can now be limited

Location:

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

Files:

• HeuristicLab.Services.OKB-3.3.csproj (modified) (1 diff)
• Query/Convert.cs (modified) (3 diffs)
• Query/DataTransfer/ValueName.cs (added)
• Query/IQueryService.cs (modified) (1 diff)
• Query/QueryService.cs (modified) (1 diff)

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

@@ -147 +147 @@
     <Compile Include="Query\DataTransfer\BoolValue.cs" />
     <Compile Include="Query\DataTransfer\CombinedFilter.cs" />
+    <Compile Include="Query\DataTransfer\ValueName.cs" />
     <Compile Include="Query\DataTransfer\NameOrdinalComparisonTimeSpanFilter.cs" />
     <Compile Include="Query\DataTransfer\OrdinalComparisonTimeSpanFilter.cs" />

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using DA = HeuristicLab.Services.OKB.DataAccess;
@@ -32 +33 @@
       dto.ParameterValues = source.Values.Where(x => x.ValueName.Category == DA.ValueNameCategory.Parameter).Select(x => Convert.ToDto(x, includeBinaryValues)).ToArray();
       dto.ResultValues = source.Values.Where(x => x.ValueName.Category == DA.ValueNameCategory.Result).Select(x => Convert.ToDto(x, includeBinaryValues)).ToArray();
+      return dto;
+    }
+
+    public static DT.Run ToDto(DA.Run source, bool includeBinaryValues, IEnumerable<DT.ValueName> valueNames) {
+      if (source == null) return null;
+      var dto = new DT.Run { Id = source.Id, Algorithm = Convert.ToDto(source.Algorithm), Problem = Convert.ToDto(source.Problem), CreatedDate = source.CreatedDate, ClientId = source.ClientId, UserId = source.UserId };
+      dto.ParameterValues = source.Values.Where(x => x.ValueName.Category == DA.ValueNameCategory.Parameter && valueNames.Count(y => y.Name == x.ValueName.Name) > 0).Select(x => Convert.ToDto(x, includeBinaryValues)).ToArray();
+      dto.ResultValues = source.Values.Where(x => x.ValueName.Category == DA.ValueNameCategory.Result && valueNames.Count(y => y.Name == x.ValueName.Name) > 0).Select(x => Convert.ToDto(x, includeBinaryValues)).ToArray();
       return dto;
     }
@@ -74 +83 @@
       }
     }
+
+    public static DT.ValueName ToDto(DA.ValueName source) {
+      if (source == null) return null;
+      return new DT.ValueName() { Id = source.Id, Category = source.Category, Name = source.Name };
+    }
   }
 }

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

@@ -42 +42 @@
     [OperationContract]
     IEnumerable<Run> GetRuns(IEnumerable<long> ids, bool includeBinaryValues);
+
+    [OperationContract]
+    IEnumerable<Run> GetRunsWithValues(IEnumerable<long> ids, bool includeBinaryValues, IEnumerable<DataTransfer.ValueName> valueNames);
+
+    [OperationContract]
+    IEnumerable<ValueName> GetValueNames();
   }
 }

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

@@ -258 +258 @@
     }
 
+    public IEnumerable<DataTransfer.Run> GetRunsWithValues(IEnumerable<long> ids, bool includeBinaryValues, IEnumerable<DataTransfer.ValueName> valueNames) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        DataLoadOptions dlo = new DataLoadOptions();
+        // TODO: specify LoadWiths
+        okb.LoadOptions = dlo;
+
+        return okb.Runs.Where(x => ids.Contains(x.Id)).Select(x => Convert.ToDto(x, includeBinaryValues, valueNames)).ToArray();
+      }
+    }
+
+    public IEnumerable<DataTransfer.ValueName> GetValueNames() {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        return okb.ValueNames.Select(x => Convert.ToDto(x)).ToArray();
+      }
+    }
+
     private IQueryable<DataAccess.Run> FilterRuns(IQueryable<DataAccess.Run> runs, Filter filter) {
       IFilter f = (IFilter)Activator.CreateInstance(Type.GetType(filter.FilterTypeName), filter);