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

Timestamp:

01/11/11 05:13:55 (14 years ago)

Author:

swagner

Message:

Worked on OKB (#1174)

Location:

branches/OKB/HeuristicLab.Services.OKB/3.3

Files:

• Filters (added)
• Filters/AlgorithmClassNameFilter.cs (added)
• Filters/AlgorithmDataDataTypeNameFilter.cs (added)
• Filters/AlgorithmNameFilter.cs (added)
• Filters/AlgorithmParameterBlobValueDataTypeNameFilter.cs (added)
• Filters/AlgorithmParameterBlobValueValueFilter.cs (added)
• Filters/AlgorithmParameterBoolValueValueFilter.cs (added)
• Filters/AlgorithmParameterFloatValueValueFilter.cs (added)
• Filters/AlgorithmParameterIntValueValueFilter.cs (added)
• Filters/AlgorithmParameterNameFilter.cs (added)
• Filters/AlgorithmParameterStringValueValueFilter.cs (added)
• Filters/AlgorithmPlattformNameFilter.cs (added)
• Filters/IFilter.cs (added)
• Filters/ProblemClassNameFilter.cs (added)
• Filters/ProblemDataDataTypeNameFilter.cs (added)
• Filters/ProblemNameFilter.cs (added)
• Filters/ProblemParameterBlobValueDataTypeNameFilter.cs (added)
• Filters/ProblemParameterBlobValueValueFilter.cs (added)
• Filters/ProblemParameterBoolValueValueFilter.cs (added)
• Filters/ProblemParameterFloatValueValueFilter.cs (added)
• Filters/ProblemParameterIntValueValueFilter.cs (added)
• Filters/ProblemParameterNameFilter.cs (added)
• Filters/ProblemParameterStringValueValueFilter.cs (added)
• Filters/ProblemPlattformNameFilter.cs (added)
• Filters/ResultBlobValueDataTypeNameFilter.cs (added)
• Filters/ResultBlobValueValueFilter.cs (added)
• Filters/ResultBoolValueValueFilter.cs (added)
• Filters/ResultFloatValueValueFilter.cs (added)
• Filters/ResultIntValueValueFilter.cs (added)
• Filters/ResultNameFilter.cs (added)
• Filters/ResultStringValueValueFilter.cs (added)
• Filters/RunClientNameFilter.cs (added)
• Filters/RunFinishedDateFilter.cs (added)
• Filters/RunRandomSeedFilter.cs (added)
• Filters/RunUserNameFilter.cs (added)
• GenericEqualityComparer.cs (added)
• HeuristicLab.Services.OKB-3.3.csproj (modified) (1 diff)
• Interfaces/IOKBService.cs (modified) (1 diff)
• OKBService.cs (modified) (2 diffs)

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

@@ -122 +122 @@
     <Compile Include="Convert.cs" />
     <Compile Include="AuthenticationService.cs" />
+    <Compile Include="Filters\AlgorithmParameterBlobValueDataTypeNameFilter.cs" />
+    <Compile Include="Filters\AlgorithmParameterBlobValueValueFilter.cs" />
+    <Compile Include="Filters\AlgorithmParameterBoolValueValueFilter.cs" />
+    <Compile Include="Filters\AlgorithmParameterFloatValueValueFilter.cs" />
+    <Compile Include="Filters\AlgorithmParameterIntValueValueFilter.cs" />
+    <Compile Include="Filters\AlgorithmParameterStringValueValueFilter.cs" />
+    <Compile Include="Filters\AlgorithmParameterNameFilter.cs" />
+    <Compile Include="Filters\AlgorithmNameFilter.cs" />
+    <Compile Include="Filters\AlgorithmClassNameFilter.cs" />
+    <Compile Include="Filters\AlgorithmPlattformNameFilter.cs" />
+    <Compile Include="Filters\AlgorithmDataDataTypeNameFilter.cs" />
+    <Compile Include="Filters\ProblemDataDataTypeNameFilter.cs" />
+    <Compile Include="Filters\ProblemPlattformNameFilter.cs" />
+    <Compile Include="Filters\ProblemClassNameFilter.cs" />
+    <Compile Include="Filters\ProblemNameFilter.cs" />
+    <Compile Include="Filters\ProblemParameterNameFilter.cs" />
+    <Compile Include="Filters\ResultNameFilter.cs" />
+    <Compile Include="Filters\RunRandomSeedFilter.cs" />
+    <Compile Include="Filters\RunFinishedDateFilter.cs" />
+    <Compile Include="Filters\RunClientNameFilter.cs" />
+    <Compile Include="Filters\RunUserNameFilter.cs" />
+    <Compile Include="Filters\ProblemParameterBlobValueDataTypeNameFilter.cs" />
+    <Compile Include="Filters\ProblemParameterBlobValueValueFilter.cs" />
+    <Compile Include="Filters\ProblemParameterBoolValueValueFilter.cs" />
+    <Compile Include="Filters\ProblemParameterFloatValueValueFilter.cs" />
+    <Compile Include="Filters\ProblemParameterIntValueValueFilter.cs" />
+    <Compile Include="Filters\ProblemParameterStringValueValueFilter.cs" />
+    <Compile Include="Filters\ResultBoolValueValueFilter.cs" />
+    <Compile Include="Filters\ResultBlobValueDataTypeNameFilter.cs" />
+    <Compile Include="Filters\ResultBlobValueValueFilter.cs" />
+    <Compile Include="Filters\ResultIntValueValueFilter.cs" />
+    <Compile Include="Filters\ResultStringValueValueFilter.cs" />
+    <Compile Include="Filters\ResultFloatValueValueFilter.cs" />
+    <Compile Include="GenericEqualityComparer.cs" />
     <Compile Include="ExperimentEqualityComparer.cs" />
+    <Compile Include="Filters\IFilter.cs" />
     <Compile Include="Interfaces\IAuthenticationService.cs" />
     <Compile Include="Interfaces\IOKBService.cs" />

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

@@ -188 +188 @@
     IEnumerable<Run> GetRuns(long experimentId);
     [OperationContract]
-    IEnumerable<Run> QueryRuns(string query);
-    [OperationContract]
     long AddRun(Run dto);
     [OperationContract]
     void DeleteRun(long id);
+    #endregion
+
+    #region Query Methods
+    [OperationContract]
+    IEnumerable<Filter> GetFilters();
+    [OperationContract]
+    IEnumerable<Run> QueryRuns(IEnumerable<Filter> filters);
     #endregion
   }

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

@@ -534 +534 @@
       }
     }
-    public IEnumerable<DataTransfer.Run> QueryRuns(string query) {
+    public long AddRun(DataTransfer.Run dto) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        DataAccess.Run entity = Convert.ToEntity(dto); entity.Id = 0;
+        okb.Runs.InsertOnSubmit(entity);
+        okb.SubmitChanges();
+        return entity.Id;
+      }
+    }
+    public void DeleteRun(long id) {
+      using (OKBDataContext okb = new OKBDataContext()) {
+        IEnumerable<DataAccess.ResultBlobValue> resultBlobValues = okb.ResultBlobValues.Where(x => x.RunId == id);
+        okb.ResultBlobValues.DeleteAllOnSubmit(resultBlobValues);
+        IEnumerable<DataAccess.ResultBoolValue> resultBoolValues = okb.ResultBoolValues.Where(x => x.RunId == id);
+        okb.ResultBoolValues.DeleteAllOnSubmit(resultBoolValues);
+        IEnumerable<DataAccess.ResultFloatValue> resultFloatValues = okb.ResultFloatValues.Where(x => x.RunId == id);
+        okb.ResultFloatValues.DeleteAllOnSubmit(resultFloatValues);
+        IEnumerable<DataAccess.ResultIntValue> resultIntValues = okb.ResultIntValues.Where(x => x.RunId == id);
+        okb.ResultIntValues.DeleteAllOnSubmit(resultIntValues);
+        IEnumerable<DataAccess.ResultStringValue> resultStringValues = okb.ResultStringValues.Where(x => x.RunId == id);
+        okb.ResultStringValues.DeleteAllOnSubmit(resultStringValues);
+
+        DataAccess.Run entity = okb.Runs.FirstOrDefault(x => x.Id == id);
+        if (entity != null) okb.Runs.DeleteOnSubmit(entity);
+        okb.SubmitChanges();
+      }
+    }
+    #endregion
+
+    #region Query Methods
+    public IEnumerable<DataTransfer.Filter> GetFilters() {
+      List<DataTransfer.Filter> filters = new List<DataTransfer.Filter>();
+      using (OKBDataContext okb = new OKBDataContext()) {
+        DataLoadOptions dlo = new DataLoadOptions();
+        dlo.LoadWith<AlgorithmParameter>(x => x.DataType);
+        dlo.LoadWith<ProblemParameter>(x => x.DataType);
+        dlo.LoadWith<Result>(x => x.DataType);
+        okb.LoadOptions = dlo;
+
+        // 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.SetComparisonStringFilter(typeof(RunUserNameFilter).AssemblyQualifiedName, "Run User Name"));
+        filters.Add(new DataTransfer.SetComparisonStringFilter(typeof(RunClientNameFilter).AssemblyQualifiedName, "Run Client Name"));
+
+        // result filters
+        filters.Add(new DataTransfer.SetComparisonStringFilter(typeof(ResultNameFilter).AssemblyQualifiedName, "Result Name"));
+        foreach (Result entity in okb.Results.Where(x => x.DataType.SqlName == "varbinary").AsEnumerable().Distinct<Result>(new GenericEqualityComparer<Result>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameSetComparisonStringFilter(typeof(ResultBlobValueDataTypeNameFilter).AssemblyQualifiedName, "Result " + entity.Name + " Value Data Type Name", entity.Name));
+        foreach (Result entity in okb.Results.Where(x => x.DataType.SqlName == "varbinary").AsEnumerable().Distinct<Result>(new GenericEqualityComparer<Result>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameEqualityComparisonByteArrayFilter(typeof(ResultBlobValueValueFilter).AssemblyQualifiedName, "Result " + entity.Name + " Value", entity.Name));
+        foreach (Result entity in okb.Results.Where(x => x.DataType.SqlName == "bit").AsEnumerable().Distinct<Result>(new GenericEqualityComparer<Result>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameEqualityComparisonBoolFilter(typeof(ResultBoolValueValueFilter).AssemblyQualifiedName, "Result " + entity.Name + " Value", entity.Name));
+        foreach (Result entity in okb.Results.Where(x => x.DataType.SqlName == "float").AsEnumerable().Distinct<Result>(new GenericEqualityComparer<Result>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameOrdinalComparisonDoubleFilter(typeof(ResultFloatValueValueFilter).AssemblyQualifiedName, "Result " + entity.Name + " Value", entity.Name));
+        foreach (Result entity in okb.Results.Where(x => x.DataType.SqlName == "bigint").AsEnumerable().Distinct<Result>(new GenericEqualityComparer<Result>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameOrdinalComparisonLongFilter(typeof(ResultIntValueValueFilter).AssemblyQualifiedName, "Result " + entity.Name + " Value", entity.Name));
+        foreach (Result entity in okb.Results.Where(x => x.DataType.SqlName == "nvarchar").AsEnumerable().Distinct<Result>(new GenericEqualityComparer<Result>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameSetComparisonStringFilter(typeof(ResultStringValueValueFilter).AssemblyQualifiedName, "Result " + entity.Name + " Value", entity.Name));
+
+        // algorithm parameter filters
+        filters.Add(new DataTransfer.SetComparisonStringFilter(typeof(AlgorithmParameterNameFilter).AssemblyQualifiedName, "Algorithm Parameter Name"));
+        foreach (AlgorithmParameter entity in okb.AlgorithmParameters.Where(x => x.DataType.SqlName == "varbinary").AsEnumerable().Distinct<AlgorithmParameter>(new GenericEqualityComparer<AlgorithmParameter>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameSetComparisonStringFilter(typeof(AlgorithmParameterBlobValueDataTypeNameFilter).AssemblyQualifiedName, "Algorithm Parameter " + entity.Name + " Value Data Type Name", entity.Name));
+        foreach (AlgorithmParameter entity in okb.AlgorithmParameters.Where(x => x.DataType.SqlName == "varbinary").AsEnumerable().Distinct<AlgorithmParameter>(new GenericEqualityComparer<AlgorithmParameter>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameEqualityComparisonByteArrayFilter(typeof(AlgorithmParameterBlobValueValueFilter).AssemblyQualifiedName, "Algorithm Parameter " + entity.Name + " Value", entity.Name));
+        foreach (AlgorithmParameter entity in okb.AlgorithmParameters.Where(x => x.DataType.SqlName == "bit").AsEnumerable().Distinct<AlgorithmParameter>(new GenericEqualityComparer<AlgorithmParameter>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameEqualityComparisonBoolFilter(typeof(AlgorithmParameterBoolValueValueFilter).AssemblyQualifiedName, "Algorithm Parameter " + entity.Name + " Value", entity.Name));
+        foreach (AlgorithmParameter entity in okb.AlgorithmParameters.Where(x => x.DataType.SqlName == "float").AsEnumerable().Distinct<AlgorithmParameter>(new GenericEqualityComparer<AlgorithmParameter>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameOrdinalComparisonDoubleFilter(typeof(AlgorithmParameterFloatValueValueFilter).AssemblyQualifiedName, "Algorithm Parameter " + entity.Name + " Value", entity.Name));
+        foreach (AlgorithmParameter entity in okb.AlgorithmParameters.Where(x => x.DataType.SqlName == "bigint").AsEnumerable().Distinct<AlgorithmParameter>(new GenericEqualityComparer<AlgorithmParameter>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameOrdinalComparisonLongFilter(typeof(AlgorithmParameterIntValueValueFilter).AssemblyQualifiedName, "Algorithm Parameter " + entity.Name + " Value", entity.Name));
+        foreach (AlgorithmParameter entity in okb.AlgorithmParameters.Where(x => x.DataType.SqlName == "nvarchar").AsEnumerable().Distinct<AlgorithmParameter>(new GenericEqualityComparer<AlgorithmParameter>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameSetComparisonStringFilter(typeof(AlgorithmParameterStringValueValueFilter).AssemblyQualifiedName, "Algorithm Parameter " + entity.Name + " Value", entity.Name));
+
+        // algorithm filters
+        filters.Add(new DataTransfer.SetComparisonStringFilter(typeof(AlgorithmNameFilter).AssemblyQualifiedName, "Algorithm Name"));
+        filters.Add(new DataTransfer.SetComparisonStringFilter(typeof(AlgorithmClassNameFilter).AssemblyQualifiedName, "Algorithm Class Name"));
+        filters.Add(new DataTransfer.SetComparisonStringFilter(typeof(AlgorithmPlattformNameFilter).AssemblyQualifiedName, "Algorithm Plattform Name"));
+        filters.Add(new DataTransfer.SetComparisonStringFilter(typeof(AlgorithmDataDataTypeNameFilter).AssemblyQualifiedName, "Algorithm Data Type Name"));
+
+        // problem parameter filters
+        filters.Add(new DataTransfer.SetComparisonStringFilter(typeof(ProblemParameterNameFilter).AssemblyQualifiedName, "Problem Parameter Name"));
+        foreach (ProblemParameter entity in okb.ProblemParameters.Where(x => x.DataType.SqlName == "varbinary").AsEnumerable().Distinct<ProblemParameter>(new GenericEqualityComparer<ProblemParameter>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameSetComparisonStringFilter(typeof(ProblemParameterBlobValueDataTypeNameFilter).AssemblyQualifiedName, "Problem Parameter " + entity.Name + " Value Data Type Name", entity.Name));
+        foreach (ProblemParameter entity in okb.ProblemParameters.Where(x => x.DataType.SqlName == "varbinary").AsEnumerable().Distinct<ProblemParameter>(new GenericEqualityComparer<ProblemParameter>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameEqualityComparisonByteArrayFilter(typeof(ProblemParameterBlobValueValueFilter).AssemblyQualifiedName, "Problem Parameter " + entity.Name + " Value", entity.Name));
+        foreach (ProblemParameter entity in okb.ProblemParameters.Where(x => x.DataType.SqlName == "bit").AsEnumerable().Distinct<ProblemParameter>(new GenericEqualityComparer<ProblemParameter>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameEqualityComparisonBoolFilter(typeof(ProblemParameterBoolValueValueFilter).AssemblyQualifiedName, "Problem Parameter " + entity.Name + " Value", entity.Name));
+        foreach (ProblemParameter entity in okb.ProblemParameters.Where(x => x.DataType.SqlName == "float").AsEnumerable().Distinct<ProblemParameter>(new GenericEqualityComparer<ProblemParameter>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameOrdinalComparisonDoubleFilter(typeof(ProblemParameterFloatValueValueFilter).AssemblyQualifiedName, "Problem Parameter " + entity.Name + " Value", entity.Name));
+        foreach (ProblemParameter entity in okb.ProblemParameters.Where(x => x.DataType.SqlName == "bigint").AsEnumerable().Distinct<ProblemParameter>(new GenericEqualityComparer<ProblemParameter>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameOrdinalComparisonLongFilter(typeof(ProblemParameterIntValueValueFilter).AssemblyQualifiedName, "Problem Parameter " + entity.Name + " Value", entity.Name));
+        foreach (ProblemParameter entity in okb.ProblemParameters.Where(x => x.DataType.SqlName == "nvarchar").AsEnumerable().Distinct<ProblemParameter>(new GenericEqualityComparer<ProblemParameter>((x, y) => x.Name == y.Name)))
+          filters.Add(new DataTransfer.NameSetComparisonStringFilter(typeof(ProblemParameterStringValueValueFilter).AssemblyQualifiedName, "Problem Parameter " + entity.Name + " Value", entity.Name));
+
+        // problem filters
+        filters.Add(new DataTransfer.SetComparisonStringFilter(typeof(ProblemNameFilter).AssemblyQualifiedName, "Problem Name"));
+        filters.Add(new DataTransfer.SetComparisonStringFilter(typeof(ProblemClassNameFilter).AssemblyQualifiedName, "Problem Class Name"));
+        filters.Add(new DataTransfer.SetComparisonStringFilter(typeof(ProblemPlattformNameFilter).AssemblyQualifiedName, "Problem Plattform Name"));
+        filters.Add(new DataTransfer.SetComparisonStringFilter(typeof(ProblemDataDataTypeNameFilter).AssemblyQualifiedName, "Problem Data Type Name"));
+      }
+      return filters.OrderBy(x => x.Label);
+    }
+    public IEnumerable<DataTransfer.Run> QueryRuns(IEnumerable<DataTransfer.Filter> filters) {
       using (OKBDataContext okb = new OKBDataContext()) {
         DataLoadOptions dlo = new DataLoadOptions();
@@ -596 +699 @@
         dlo.LoadWith<Problem>(x => x.Platform);
         okb.LoadOptions = dlo;
-        var runs = okb.Runs.Where(x => x.ResultFloatValues.Any(y => y.Result.Name == "BestQuality" && y.Value > double.Parse(query)));
+
+        var runs = okb.Runs.AsQueryable<Run>();
+        foreach (DataTransfer.Filter filter in filters) {
+          IFilter f = (IFilter)Activator.CreateInstance(Type.GetType(filter.FilterTypeName), filter);
+          runs = f.Apply(runs);
+        }
         return runs.Select(x => Convert.ToDto(x)).ToArray();
-      }
-    }
-    public long AddRun(DataTransfer.Run dto) {
-      using (OKBDataContext okb = new OKBDataContext()) {
-        DataAccess.Run entity = Convert.ToEntity(dto); entity.Id = 0;
-        okb.Runs.InsertOnSubmit(entity);
-        okb.SubmitChanges();
-        return entity.Id;
-      }
-    }
-    public void DeleteRun(long id) {
-      using (OKBDataContext okb = new OKBDataContext()) {
-        IEnumerable<DataAccess.ResultBlobValue> resultBlobValues = okb.ResultBlobValues.Where(x => x.RunId == id);
-        okb.ResultBlobValues.DeleteAllOnSubmit(resultBlobValues);
-        IEnumerable<DataAccess.ResultBoolValue> resultBoolValues = okb.ResultBoolValues.Where(x => x.RunId == id);
-        okb.ResultBoolValues.DeleteAllOnSubmit(resultBoolValues);
-        IEnumerable<DataAccess.ResultFloatValue> resultFloatValues = okb.ResultFloatValues.Where(x => x.RunId == id);
-        okb.ResultFloatValues.DeleteAllOnSubmit(resultFloatValues);
-        IEnumerable<DataAccess.ResultIntValue> resultIntValues = okb.ResultIntValues.Where(x => x.RunId == id);
-        okb.ResultIntValues.DeleteAllOnSubmit(resultIntValues);
-        IEnumerable<DataAccess.ResultStringValue> resultStringValues = okb.ResultStringValues.Where(x => x.RunId == id);
-        okb.ResultStringValues.DeleteAllOnSubmit(resultStringValues);
-
-        DataAccess.Run entity = okb.Runs.FirstOrDefault(x => x.Id == id);
-        if (entity != null) okb.Runs.DeleteOnSubmit(entity);
-        okb.SubmitChanges();
       }
     }