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

Timestamp:

03/06/12 19:06:17 (12 years ago)

Author:

ascheibe

Message:

#1174 added support for PercentValue

Location:

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

Files:

• HeuristicLab.Services.OKB-3.3.csproj (modified) (4 diffs)
• Query/Convert.cs (modified) (1 diff)
• Query/DataTransfer/Filter.cs (modified) (1 diff)
• Query/DataTransfer/NameOrdinalComparisonPercentFilter.cs (added)
• Query/DataTransfer/OrdinalComparisonPercentFilter.cs (added)
• Query/DataTransfer/PercentValue.cs (added)
• Query/DataTransfer/Value.cs (modified) (1 diff)
• Query/Filters/PercentValueFilter.cs (added)
• Query/QueryService.cs (modified) (2 diffs)
• RunCreation/Convert.cs (modified) (1 diff)
• RunCreation/DataTransfer/PercentValue.cs (added)
• RunCreation/DataTransfer/Value.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\OrdinalComparisonPercentFilter.cs" />
+    <Compile Include="Query\DataTransfer\NameOrdinalComparisonPercentFilter.cs" />
     <Compile Include="Query\DataTransfer\OrdinalComparisonFloatFilter.cs" />
     <Compile Include="Query\DataTransfer\OrdinalComparisonDoubleFilter.cs" />
@@ -172 +174 @@
     <Compile Include="Query\DataTransfer\OrdinalComparisonIntFilter.cs" />
     <Compile Include="Query\DataTransfer\OrdinalComparisonLongFilter.cs" />
+    <Compile Include="Query\DataTransfer\PercentValue.cs" />
     <Compile Include="Query\DataTransfer\Problem.cs" />
     <Compile Include="Query\DataTransfer\Run.cs" />
@@ -192 +195 @@
     <Compile Include="Query\Filters\BoolValueFilter.cs" />
     <Compile Include="Query\Filters\BinaryValueFilter.cs" />
+    <Compile Include="Query\Filters\PercentValueFilter.cs" />
     <Compile Include="Query\Filters\StringValueFilter.cs" />
     <Compile Include="Query\Filters\FloatValueFilter.cs" />
@@ -233 +237 @@
     <Compile Include="RunCreation\DataTransfer\BinaryValue.cs" />
     <Compile Include="RunCreation\DataTransfer\BoolValue.cs" />
+    <Compile Include="RunCreation\DataTransfer\PercentValue.cs" />
     <Compile Include="RunCreation\DataTransfer\DataType.cs" />
     <Compile Include="RunCreation\DataTransfer\DoubleValue.cs" />

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

@@ -62 +62 @@
       } else if (source.ValueName.Type == DA.ValueNameType.Double) {
         return new DT.DoubleValue { Name = source.ValueName.Name, DataType = Convert.ToDto(source.DataType), Value = source.DoubleValue.GetValueOrDefault() };
+      } else if (source.ValueName.Type == DA.ValueNameType.Percent) {
+        return new DT.PercentValue { Name = source.ValueName.Name, DataType = Convert.ToDto(source.DataType), Value = source.DoubleValue.GetValueOrDefault() };
       } else if (source.ValueName.Type == DA.ValueNameType.String) {
         return new DT.StringValue { Name = source.ValueName.Name, DataType = Convert.ToDto(source.DataType), Value = source.StringValue };

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

@@ -33 +33 @@
   [KnownType(typeof(NameOrdinalComparisonFloatFilter))]
   [KnownType(typeof(NameOrdinalComparisonDoubleFilter))]
+  [KnownType(typeof(NameOrdinalComparisonPercentFilter))]
   [KnownType(typeof(NameOrdinalComparisonIntFilter))]
   [KnownType(typeof(NameOrdinalComparisonLongFilter))]

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

@@ -31 +31 @@
   [KnownType(typeof(StringValue))]
   [KnownType(typeof(BinaryValue))]
+  [KnownType(typeof(PercentValue))]
   public abstract class Value {
     [DataMember]

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

@@ -87 +87 @@
             name
           ));
+        foreach (string name in okb.ValueNames.Where(x => (x.Category == ValueNameCategory.Parameter) && (x.Type == ValueNameType.Percent)).Select(x => x.Name).Distinct())
+          filters.Add(new NameOrdinalComparisonPercentFilter(
+            typeof(PercentValueFilter).AssemblyQualifiedName,
+            "Parameter " + name + " Value",
+            name
+          ));
         foreach (string name in okb.ValueNames.Where(x => (x.Category == ValueNameCategory.Parameter) && (x.Type == ValueNameType.String)).Select(x => x.Name).Distinct())
           filters.Add(new NameStringComparisonFilter(
@@ -144 +150 @@
             name
           ));
+        foreach (string name in okb.ValueNames.Where(x => (x.Category == ValueNameCategory.Result) && (x.Type == ValueNameType.Percent)).Select(x => x.Name).Distinct())
+          filters.Add(new NameOrdinalComparisonPercentFilter(
+            typeof(PercentValueFilter).AssemblyQualifiedName,
+            "Result " + name + " Value",
+            name
+          ));
         foreach (string name in okb.ValueNames.Where(x => (x.Category == ValueNameCategory.Result) && (x.Type == ValueNameType.String)).Select(x => x.Name).Distinct())
           filters.Add(new NameStringComparisonFilter(

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

@@ -86 +86 @@
         entity.ValueName = Convert.ToEntity(source.Name, category, DA.ValueNameType.Double, okb);
         entity.DoubleValue = ((DT.DoubleValue)source).Value;
+      } else if (source is DT.PercentValue) {
+        entity.ValueName = Convert.ToEntity(source.Name, category, DA.ValueNameType.Percent, okb);
+        entity.DoubleValue = ((DT.PercentValue)source).Value;
       } else if (source is DT.StringValue) {
         entity.ValueName = Convert.ToEntity(source.Name, category, DA.ValueNameType.String, okb);

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

@@ -31 +31 @@
   [KnownType(typeof(StringValue))]
   [KnownType(typeof(BinaryValue))]
+  [KnownType(typeof(PercentValue))]
   public abstract class Value {
     [DataMember]