Changeset 5295 for branches/OKB/HeuristicLab.Services.OKB/3.3

Timestamp:

01/14/11 05:34:43 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB

Files:

• . (modified) (1 prop)
• HeuristicLab.Services.OKB/3.3/Convert.cs (modified) (3 diffs)
• HeuristicLab.Services.OKB/3.3/Filters/AlgorithmDataDataTypeNameFilter.cs (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/Filters/AlgorithmParameterBlobValueDataTypeNameFilter.cs (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/Filters/ProblemDataDataTypeNameFilter.cs (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/Filters/ProblemParameterBlobValueDataTypeNameFilter.cs (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/Filters/ResultBlobValueDataTypeNameFilter.cs (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/Filters/RunCreatedDateFilter.cs (moved) (moved from branches/OKB/HeuristicLab.Services.OKB/3.3/Filters/RunFinishedDateFilter.cs) (3 diffs)
• HeuristicLab.Services.OKB/3.3/Filters/RunRandomSeedFilter.cs (modified) (2 diffs)
• HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/Interfaces/IOKBService.cs (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/OKBService.cs (modified) (3 diffs)
• HeuristicLab.Services.OKB/3.3/app.config (modified) (1 diff)

branches/OKB

@@ -1 +1 @@
 *.suo
+TestResults

@@ -1 +1 @@
 *.suo
+TestResults

branches/OKB/HeuristicLab.Services.OKB/3.3/Convert.cs

@@ -47 +47 @@
     public static DT.DataType ToDto(DA.DataType source) {
       if (source == null) return null;
-      return new DT.DataType { Id = source.Id, Name = source.Name, SqlName = source.SqlName, PlatformId = source.PlatformId };
+      return new DT.DataType { Id = source.Id, Name = source.Name, TypeName = source.TypeName, SqlName = source.SqlName, PlatformId = source.PlatformId };
     }
     public static DA.DataType ToEntity(DT.DataType source) {
       if (source == null) return null;
-      return new DA.DataType { Id = source.Id, Name = source.Name, SqlName = source.SqlName, PlatformId = source.PlatformId };
+      return new DA.DataType { Id = source.Id, Name = source.Name, TypeName = source.TypeName, SqlName = source.SqlName, PlatformId = source.PlatformId };
     }
     public static void ToEntity(DT.DataType source, DA.DataType target) {
       if ((source != null) && (target != null)) {
-        target.Id = source.Id; target.Name = source.Name; target.SqlName = source.SqlName; target.PlatformId = source.PlatformId;
+        target.Id = source.Id; target.Name = source.Name; target.TypeName = source.TypeName; target.SqlName = source.SqlName; target.PlatformId = source.PlatformId;
       }
     }
@@ -515 +515 @@
     public static DT.Run ToDto(DA.Run source) {
       if (source == null) return null;
-      DT.Run target = new DT.Run { Id = source.Id, RandomSeed = source.RandomSeed, FinishedDate = source.FinishedDate, ExperimentId = source.ExperimentId, UserId = source.UserId, ClientId = source.ClientId };
+      DT.Run target = new DT.Run { Id = source.Id, RandomSeed = source.RandomSeed, CreatedDate = source.CreatedDate, ExperimentId = source.ExperimentId, UserId = source.UserId, ClientId = source.ClientId };
 
       List<DT.ResultValue> resultValues = new List<DT.ResultValue>();
@@ -540 +540 @@
     public static void ToEntity(DT.Run source, DA.Run target) {
       if ((source != null) && (target != null)) {
-        target.Id = source.Id; target.RandomSeed = source.RandomSeed; target.FinishedDate = source.FinishedDate; target.ExperimentId = source.ExperimentId; target.UserId = source.UserId; target.ClientId = source.ClientId;
+        target.Id = source.Id; target.RandomSeed = source.RandomSeed; target.CreatedDate = source.CreatedDate; target.ExperimentId = source.ExperimentId; target.UserId = source.UserId; target.ClientId = source.ClientId;
 
         foreach (DT.ResultBlobValue value in source.ResultValues.OfType<DT.ResultBlobValue>())

branches/OKB/HeuristicLab.Services.OKB/3.3/Filters/AlgorithmDataDataTypeNameFilter.cs

@@ -33 +33 @@
         switch (Comparison) {
           case DataTransfer.SetComparison.Equal:
-            return x => x.Experiment.Algorithm.AlgorithmData.DataType.Name == Value;
+            return x => (x.Experiment.Algorithm.AlgorithmData.DataType.Name == Value) || (x.Experiment.Algorithm.AlgorithmData.DataType.TypeName == Value);
           case DataTransfer.SetComparison.NotEqual:
-            return x => x.Experiment.Algorithm.AlgorithmData.DataType.Name != Value;
+            return x => (x.Experiment.Algorithm.AlgorithmData.DataType.Name != Value) && (x.Experiment.Algorithm.AlgorithmData.DataType.TypeName != Value);
           case DataTransfer.SetComparison.Contains:
-            return x => x.Experiment.Algorithm.AlgorithmData.DataType.Name.Contains(Value);
+            return x => x.Experiment.Algorithm.AlgorithmData.DataType.Name.Contains(Value) || x.Experiment.Algorithm.AlgorithmData.DataType.TypeName.Contains(Value);
           case DataTransfer.SetComparison.NotContains:
-            return x => !x.Experiment.Algorithm.AlgorithmData.DataType.Name.Contains(Value);
+            return x => !x.Experiment.Algorithm.AlgorithmData.DataType.Name.Contains(Value) && !x.Experiment.Algorithm.AlgorithmData.DataType.TypeName.Contains(Value);
           default:
             return x => true;

branches/OKB/HeuristicLab.Services.OKB/3.3/Filters/AlgorithmParameterBlobValueDataTypeNameFilter.cs

@@ -35 +35 @@
         switch (Comparison) {
           case DataTransfer.SetComparison.Equal:
-            return x => x.Experiment.AlgorithmParameterBlobValues.Any(y => ((y.AlgorithmParameter.Name == Name) || (y.AlgorithmParameter.Alias == Name)) && (y.DataType.Name == Value));
+            return x => x.Experiment.AlgorithmParameterBlobValues.Any(y => ((y.AlgorithmParameter.Name == Name) || (y.AlgorithmParameter.Alias == Name)) && ((y.DataType.Name == Value) || (y.DataType.TypeName == Value)));
           case DataTransfer.SetComparison.NotEqual:
-            return x => x.Experiment.AlgorithmParameterBlobValues.Any(y => ((y.AlgorithmParameter.Name == Name) || (y.AlgorithmParameter.Alias == Name)) && (y.DataType.Name != Value));
+            return x => x.Experiment.AlgorithmParameterBlobValues.Any(y => ((y.AlgorithmParameter.Name == Name) || (y.AlgorithmParameter.Alias == Name)) && ((y.DataType.Name != Value) && (!(y.DataType.TypeName != Value))));
           case DataTransfer.SetComparison.Contains:
-            return x => x.Experiment.AlgorithmParameterBlobValues.Any(y => ((y.AlgorithmParameter.Name == Name) || (y.AlgorithmParameter.Alias == Name)) && y.DataType.Name.Contains(Value));
+            return x => x.Experiment.AlgorithmParameterBlobValues.Any(y => ((y.AlgorithmParameter.Name == Name) || (y.AlgorithmParameter.Alias == Name)) && (y.DataType.Name.Contains(Value) || y.DataType.TypeName.Contains(Value)));
           case DataTransfer.SetComparison.NotContains:
-            return x => x.Experiment.AlgorithmParameterBlobValues.Any(y => ((y.AlgorithmParameter.Name == Name) || (y.AlgorithmParameter.Alias == Name)) && !y.DataType.Name.Contains(Value));
+            return x => x.Experiment.AlgorithmParameterBlobValues.Any(y => ((y.AlgorithmParameter.Name == Name) || (y.AlgorithmParameter.Alias == Name)) && (!y.DataType.Name.Contains(Value) && !y.DataType.TypeName.Contains(Value)));
           default:
             return x => true;

branches/OKB/HeuristicLab.Services.OKB/3.3/Filters/ProblemDataDataTypeNameFilter.cs

@@ -33 +33 @@
         switch (Comparison) {
           case DataTransfer.SetComparison.Equal:
-            return x => x.Experiment.Problem.ProblemData.DataType.Name == Value;
+            return x => (x.Experiment.Problem.ProblemData.DataType.Name == Value) || (x.Experiment.Problem.ProblemData.DataType.TypeName == Value);
           case DataTransfer.SetComparison.NotEqual:
-            return x => x.Experiment.Problem.ProblemData.DataType.Name != Value;
+            return x => (x.Experiment.Problem.ProblemData.DataType.Name != Value) && (x.Experiment.Problem.ProblemData.DataType.TypeName != Value);
           case DataTransfer.SetComparison.Contains:
-            return x => x.Experiment.Problem.ProblemData.DataType.Name.Contains(Value);
+            return x => x.Experiment.Problem.ProblemData.DataType.Name.Contains(Value) || x.Experiment.Problem.ProblemData.DataType.TypeName.Contains(Value);
           case DataTransfer.SetComparison.NotContains:
-            return x => !x.Experiment.Problem.ProblemData.DataType.Name.Contains(Value);
+            return x => !x.Experiment.Problem.ProblemData.DataType.Name.Contains(Value) && !x.Experiment.Problem.ProblemData.DataType.TypeName.Contains(Value);
           default:
             return x => true;

branches/OKB/HeuristicLab.Services.OKB/3.3/Filters/ProblemParameterBlobValueDataTypeNameFilter.cs

@@ -35 +35 @@
         switch (Comparison) {
           case DataTransfer.SetComparison.Equal:
-            return x => x.Experiment.ProblemParameterBlobValues.Any(y => ((y.ProblemParameter.Name == Name) || (y.ProblemParameter.Alias == Name)) && (y.DataType.Name == Value));
+            return x => x.Experiment.ProblemParameterBlobValues.Any(y => ((y.ProblemParameter.Name == Name) || (y.ProblemParameter.Alias == Name)) && ((y.DataType.Name == Value) || (y.DataType.TypeName == Value)));
           case DataTransfer.SetComparison.NotEqual:
-            return x => x.Experiment.ProblemParameterBlobValues.Any(y => ((y.ProblemParameter.Name == Name) || (y.ProblemParameter.Alias == Name)) && (y.DataType.Name != Value));
+            return x => x.Experiment.ProblemParameterBlobValues.Any(y => ((y.ProblemParameter.Name == Name) || (y.ProblemParameter.Alias == Name)) && ((y.DataType.Name != Value) && (!(y.DataType.TypeName != Value))));
           case DataTransfer.SetComparison.Contains:
-            return x => x.Experiment.ProblemParameterBlobValues.Any(y => ((y.ProblemParameter.Name == Name) || (y.ProblemParameter.Alias == Name)) && y.DataType.Name.Contains(Value));
+            return x => x.Experiment.ProblemParameterBlobValues.Any(y => ((y.ProblemParameter.Name == Name) || (y.ProblemParameter.Alias == Name)) && (y.DataType.Name.Contains(Value) || y.DataType.TypeName.Contains(Value)));
           case DataTransfer.SetComparison.NotContains:
-            return x => x.Experiment.ProblemParameterBlobValues.Any(y => ((y.ProblemParameter.Name == Name) || (y.ProblemParameter.Alias == Name)) && !y.DataType.Name.Contains(Value));
+            return x => x.Experiment.ProblemParameterBlobValues.Any(y => ((y.ProblemParameter.Name == Name) || (y.ProblemParameter.Alias == Name)) && (!y.DataType.Name.Contains(Value) && !y.DataType.TypeName.Contains(Value)));
           default:
             return x => true;

branches/OKB/HeuristicLab.Services.OKB/3.3/Filters/ResultBlobValueDataTypeNameFilter.cs

@@ -35 +35 @@
         switch (Comparison) {
           case DataTransfer.SetComparison.Equal:
-            return x => x.ResultBlobValues.Any(y => ((y.Result.Name == Name) || (y.Result.Alias == Name)) && (y.DataType.Name == Value));
+            return x => x.ResultBlobValues.Any(y => ((y.Result.Name == Name) || (y.Result.Alias == Name)) && ((y.DataType.Name == Value) || (y.DataType.TypeName == Value)));
           case DataTransfer.SetComparison.NotEqual:
-            return x => x.ResultBlobValues.Any(y => ((y.Result.Name == Name) || (y.Result.Alias == Name)) && (y.DataType.Name != Value));
+            return x => x.ResultBlobValues.Any(y => ((y.Result.Name == Name) || (y.Result.Alias == Name)) && ((y.DataType.Name != Value) && (!(y.DataType.TypeName != Value))));
           case DataTransfer.SetComparison.Contains:
-            return x => x.ResultBlobValues.Any(y => ((y.Result.Name == Name) || (y.Result.Alias == Name)) && y.DataType.Name.Contains(Value));
+            return x => x.ResultBlobValues.Any(y => ((y.Result.Name == Name) || (y.Result.Alias == Name)) && (y.DataType.Name.Contains(Value) || y.DataType.TypeName.Contains(Value)));
           case DataTransfer.SetComparison.NotContains:
-            return x => x.ResultBlobValues.Any(y => ((y.Result.Name == Name) || (y.Result.Alias == Name)) && !y.DataType.Name.Contains(Value));
+            return x => x.ResultBlobValues.Any(y => ((y.Result.Name == Name) || (y.Result.Alias == Name)) && (!y.DataType.Name.Contains(Value) && !y.DataType.TypeName.Contains(Value)));
           default:
             return x => true;

branches/OKB/HeuristicLab.Services.OKB/3.3/Filters/RunCreatedDateFilter.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Services.OKB {
-  public class RunFinishedDateFilter : IFilter {
+  public class RunCreatedDateFilter : IFilter {
     public DataTransfer.OrdinalComparison Comparison { get; set; }
     public DateTime Value { get; set; }
@@ -33 +33 @@
         switch (Comparison) {
           case DataTransfer.OrdinalComparison.Less:
-            return x => x.FinishedDate < Value;
+            return x => x.CreatedDate < Value;
           case DataTransfer.OrdinalComparison.LessOrEqual:
-            return x => x.FinishedDate <= Value;
+            return x => x.CreatedDate <= Value;
           case DataTransfer.OrdinalComparison.Equal:
-            return x => x.FinishedDate == Value;
+            return x => x.CreatedDate == Value;
           case DataTransfer.OrdinalComparison.GreaterOrEqual:
-            return x => x.FinishedDate >= Value;
+            return x => x.CreatedDate >= Value;
           case DataTransfer.OrdinalComparison.Greater:
-            return x => x.FinishedDate > Value;
+            return x => x.CreatedDate > Value;
           case DataTransfer.OrdinalComparison.NotEqual:
-            return x => x.FinishedDate != Value;
+            return x => x.CreatedDate != Value;
           default:
             return x => true;
@@ -50 +50 @@
     }
 
-    public RunFinishedDateFilter(DataTransfer.OrdinalComparison comparison, DateTime value) {
+    public RunCreatedDateFilter(DataTransfer.OrdinalComparison comparison, DateTime value) {
       Comparison = comparison;
       Value = value;
     }
-    public RunFinishedDateFilter(DataTransfer.OrdinalComparisonDateTimeFilter filter) {
+    public RunCreatedDateFilter(DataTransfer.OrdinalComparisonDateTimeFilter filter) {
       Comparison = filter.Comparison;
       Value = filter.Value;

branches/OKB/HeuristicLab.Services.OKB/3.3/Filters/RunRandomSeedFilter.cs

@@ -27 +27 @@
   public class RunRandomSeedFilter : IFilter {
     public DataTransfer.OrdinalComparison Comparison { get; set; }
-    public int Value { get; set; }
+    public long Value { get; set; }
 
     public Expression<Func<Run, bool>> Expression {
@@ -50 +50 @@
     }
 
-    public RunRandomSeedFilter(DataTransfer.OrdinalComparison comparison, int value) {
+    public RunRandomSeedFilter(DataTransfer.OrdinalComparison comparison, long value) {
       Comparison = comparison;
       Value = value;
     }
-    public RunRandomSeedFilter(DataTransfer.OrdinalComparisonIntFilter filter) {
+    public RunRandomSeedFilter(DataTransfer.OrdinalComparisonLongFilter filter) {
       Comparison = filter.Comparison;
       Value = filter.Value;

branches/OKB/HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj

@@ -141 +141 @@
     <Compile Include="Filters\ProblemParameterNameFilter.cs" />
     <Compile Include="Filters\ResultNameFilter.cs" />
+    <Compile Include="Filters\RunCreatedDateFilter.cs" />
     <Compile Include="Filters\RunRandomSeedFilter.cs" />
-    <Compile Include="Filters\RunFinishedDateFilter.cs" />
     <Compile Include="Filters\RunClientNameFilter.cs" />
     <Compile Include="Filters\RunUserNameFilter.cs" />

branches/OKB/HeuristicLab.Services.OKB/3.3/Interfaces/IOKBService.cs

@@ -197 +197 @@
     IEnumerable<Filter> GetFilters();
     [OperationContract]
+    long QueryNumberOfRuns(Filter filter);
+    [OperationContract]
     IEnumerable<Run> QueryRuns(Filter filter);
     #endregion

branches/OKB/HeuristicLab.Services.OKB/3.3/OKBService.cs

@@ -577 +577 @@
 
         // run filters
-        filters.Add(new DataTransfer.OrdinalComparisonIntFilter(typeof(RunRandomSeedFilter).AssemblyQualifiedName, "Run Random Seed"));
-        filters.Add(new DataTransfer.OrdinalComparisonDateTimeFilter(typeof(RunFinishedDateFilter).AssemblyQualifiedName, "Run Finished Date"));
+        filters.Add(new DataTransfer.OrdinalComparisonLongFilter(typeof(RunRandomSeedFilter).AssemblyQualifiedName, "Run Random Seed"));
+        filters.Add(new DataTransfer.OrdinalComparisonDateTimeFilter(typeof(RunCreatedDateFilter).AssemblyQualifiedName, "Run Created Date"));
         filters.Add(new DataTransfer.SetComparisonStringFilter(typeof(RunUserNameFilter).AssemblyQualifiedName, "Run User Name"));
         filters.Add(new DataTransfer.SetComparisonStringFilter(typeof(RunClientNameFilter).AssemblyQualifiedName, "Run Client Name"));
@@ -644 +644 @@
       }
       return filters.OrderBy(x => x.Label);
+    }
+    public long QueryNumberOfRuns(DataTransfer.Filter filter) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        IFilter convertedFilter = (IFilter)Activator.CreateInstance(Type.GetType(filter.FilterTypeName), filter);
+        return okb.Runs.Where(convertedFilter.Expression).LongCount();
+      }
     }
     public IEnumerable<DataTransfer.Run> QueryRuns(DataTransfer.Filter filter) {
@@ -708 +714 @@
         //okb.LoadOptions = dlo;
 
+        DataLoadOptions dlo = new DataLoadOptions();
+        dlo.LoadWith<Run>(x => x.ResultBlobValues);
+        dlo.LoadWith<Run>(x => x.ResultBoolValues);
+        dlo.LoadWith<Run>(x => x.ResultFloatValues);
+        dlo.LoadWith<Run>(x => x.ResultIntValues);
+        dlo.LoadWith<Run>(x => x.ResultStringValues);
+        okb.LoadOptions = dlo;
+
         IFilter convertedFilter = (IFilter)Activator.CreateInstance(Type.GetType(filter.FilterTypeName), filter);
-        var runs = okb.Runs.Where(convertedFilter.Expression);
-        return runs.Select(x => Convert.ToDto(x)).ToArray();
+        var runs = okb.Runs.Where(convertedFilter.Expression).ToArray();
+        var result = runs.Select(x => Convert.ToDto(x)).ToArray();
+        return result;
       }
     }

branches/OKB/HeuristicLab.Services.OKB/3.3/app.config

@@ -62 +62 @@
             <userNameAuthentication userNamePasswordValidationMode="MembershipProvider" membershipProviderName="AspNetSqlMembershipProvider" />
           </serviceCredentials>
+          <dataContractSerializer maxItemsInObjectGraph="6553600" />
         </behavior>
       </serviceBehaviors>

@@ -1 +1 @@
 *.suo
+TestResults