Changeset 13511 for trunk/sources/HeuristicLab.Services.OKB/3.3/Query

Timestamp:

01/15/16 12:13:51 (9 years ago)

Author:

abeham

Message:

#2560: Moved both get and set characteristic values functionality to run creation service

Location:

trunk/sources/HeuristicLab.Services.OKB/3.3/Query

Files:

• Convert.cs (modified) (1 diff)
• IQueryService.cs (modified) (1 diff)
• QueryService.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Services.OKB/3.3/Query/Convert.cs

@@ -88 +88 @@
       return new DT.ValueName() { Id = source.Id, Category = source.Category, Name = source.Name };
     }
-
-    public static DT.Value ToDto(DA.CharacteristicValue source) {
-      if (source == null) return null;
-      if (source.Characteristic.Type == DA.CharacteristicType.Bool) {
-        return new DT.BoolValue { Name = source.Characteristic.Name, DataType = Convert.ToDto(source.DataType), Value = source.BoolValue.GetValueOrDefault() };
-      } else if (source.Characteristic.Type == DA.CharacteristicType.Int) {
-        return new DT.IntValue { Name = source.Characteristic.Name, DataType = Convert.ToDto(source.DataType), Value = source.IntValue.GetValueOrDefault() };
-      } else if (source.Characteristic.Type == DA.CharacteristicType.TimeSpan) {
-        return new DT.TimeSpanValue { Name = source.Characteristic.Name, DataType = Convert.ToDto(source.DataType), Value = source.LongValue.GetValueOrDefault() };
-      } else if (source.Characteristic.Type == DA.CharacteristicType.Long) {
-        return new DT.LongValue { Name = source.Characteristic.Name, DataType = Convert.ToDto(source.DataType), Value = source.LongValue.GetValueOrDefault() };
-      } else if (source.Characteristic.Type == DA.CharacteristicType.Float) {
-        return new DT.FloatValue { Name = source.Characteristic.Name, DataType = Convert.ToDto(source.DataType), Value = source.FloatValue.GetValueOrDefault() };
-      } else if (source.Characteristic.Type == DA.CharacteristicType.Double) {
-        return new DT.DoubleValue { Name = source.Characteristic.Name, DataType = Convert.ToDto(source.DataType), Value = source.DoubleValue.GetValueOrDefault() };
-      } else if (source.Characteristic.Type == DA.CharacteristicType.Percent) {
-        return new DT.PercentValue { Name = source.Characteristic.Name, DataType = Convert.ToDto(source.DataType), Value = source.DoubleValue.GetValueOrDefault() };
-      } else if (source.Characteristic.Type == DA.CharacteristicType.String) {
-        return new DT.StringValue { Name = source.Characteristic.Name, DataType = Convert.ToDto(source.DataType), Value = source.StringValue };
-      } else {
-        throw new ArgumentException("Unknown characteristic type.", "source");
-      }
-    }
   }
 }

trunk/sources/HeuristicLab.Services.OKB/3.3/Query/IQueryService.cs

@@ -48 +48 @@
     [OperationContract]
     IEnumerable<ValueName> GetValueNames();
-
-    [OperationContract]
-    IEnumerable<Value> GetCharacteristics(long problemId);
   }
 }

trunk/sources/HeuristicLab.Services.OKB/3.3/Query/QueryService.cs

@@ -278 +278 @@
     }
 
-
-    public IEnumerable<DataTransfer.Value> GetCharacteristics(long problemId) {
-      using (OKBDataContext okb = new OKBDataContext()) {
-        var prob = okb.Problems.SingleOrDefault(x => x.Id == problemId);
-        if (prob == null) return Enumerable.Empty<DataTransfer.Value>();
-        return prob.CharacteristicValues.Select(Convert.ToDto).ToArray();
-      }
-    }
-
     private List<DataAccess.Run> FilterRuns(IQueryable<DataAccess.Run> runs, Filter filter, OKBDataContext okb) {
       IFilter f = (IFilter)Activator.CreateInstance(Type.GetType(filter.FilterTypeName), filter);