Changeset 13501 for trunk/sources

Timestamp:

01/12/16 16:08:38 (9 years ago)

Author:

abeham

Message:

#2560: added service methods

Location:

trunk/sources

Files:

• HeuristicLab.Services.OKB.DataAccess/3.3/CharacteristicType.cs (copied) (copied from trunk/sources/HeuristicLab.Services.OKB.DataAccess/3.3/ValueNameType.cs) (2 diffs)
• HeuristicLab.Services.OKB.DataAccess/3.3/HeuristicLab.Services.OKB.DataAccess-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml (modified) (1 diff)
• HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml.layout (modified) (2 diffs)
• HeuristicLab.Services.OKB.DataAccess/3.3/OKB.designer.cs (modified) (4 diffs)
• HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/Query/Convert.cs (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/Query/IQueryService.cs (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/Query/QueryService.cs (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/RunCreation/Convert.cs (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/RunCreation/IRunCreationService.cs (modified) (1 diff)
• HeuristicLab.Services.OKB/3.3/RunCreation/MissingProblem.cs (added)
• HeuristicLab.Services.OKB/3.3/RunCreation/RunCreationService.cs (modified) (2 diffs)
• HeuristicLab.Services.OKB/3.3/RunCreation/UnknownCharacteristicType.cs (added)

trunk/sources/HeuristicLab.Services.OKB.DataAccess/3.3/CharacteristicType.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Services.OKB.DataAccess {
-  public enum ValueNameType {
+  public enum CharacteristicType {
     Bool = 0,
     Int = 1,
@@ -28 +28 @@
     Double = 4,
     String = 5,
-    Binary = 6,
-    Percent = 7,
-    TimeSpan = 8
+    Percent = 6,
+    TimeSpan = 7
   }
 }

trunk/sources/HeuristicLab.Services.OKB.DataAccess/3.3/HeuristicLab.Services.OKB.DataAccess-3.3.csproj

@@ -128 +128 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CharacteristicType.cs" />
     <Compile Include="ValueNameType.cs" />
     <Compile Include="ValueNameCategory.cs" />

trunk/sources/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml

@@ -141 +141 @@
       <Column Name="Id" Type="System.Int64" DbType="BigInt NOT NULL IDENTITY" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
       <Column Name="Name" Type="System.String" DbType="NVarChar(200) NOT NULL" CanBeNull="false" />
-      <Column Name="Type" Type="System.Byte" DbType="TinyInt NOT NULL" CanBeNull="false" />
+      <Column Name="Type" Type="CharacteristicType" DbType="TinyInt NOT NULL" CanBeNull="false" />
       <Association Name="Characteristic_CharacteristicValue" Member="CharacteristicValues" ThisKey="Id" OtherKey="CharacteristicId" Type="CharacteristicValue" />
     </Type>

trunk/sources/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml.layout

@@ -139 +139 @@
       </nestedChildShapes>
     </classShape>
-    <associationConnector edgePoints="[(3.24167093356531 : 2.65549967447917); (3.24167093356531 : 8.23159912109375); (5.75 : 8.23159912109375)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(3.24167093356531 : 2.65549967447917); (3.24167093356531 : 8.23159912109375); (5.75 : 8.23159912109375)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/OKBDataContext/Algorithm/Algorithm_Run" />
       <nodes>
@@ -146 +146 @@
       </nodes>
     </associationConnector>
-    <associationConnector edgePoints="[(12.7565713753709 : 2.65549967447917); (12.7565713753709 : 8.23159912109375); (8.13243692318721 : 8.23159912109375 : JumpStart); (7.96577025652055 : 8.23159912109375 : JumpEnd); (7.75 : 8.23159912109375)]" fixedFrom="Algorithm" fixedTo="Algorithm">
+    <associationConnector edgePoints="[(12.7565713753709 : 2.65549967447917); (12.7565713753709 : 8.23159912109375); (8.13243692318721 : 8.23159912109375 : JumpStart); (7.96577025652055 : 8.23159912109375 : JumpEnd); (7.75 : 8.23159912109375)]" fixedFrom="NotFixed" fixedTo="NotFixed">
       <AssociationMoniker Name="/OKBDataContext/Problem/Problem_Run" />
       <nodes>

trunk/sources/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.designer.cs

@@ -3 +3 @@
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Runtime Version:4.0.30319.34209
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
@@ -3140 +3140 @@
     private string _Name;
     
-    private byte _Type;
+    private CharacteristicType _Type;
     
     private EntitySet<CharacteristicValue> _CharacteristicValues;
@@ -3152 +3152 @@
     partial void OnNameChanging(string value);
     partial void OnNameChanged();
-    partial void OnTypeChanging(byte value);
+    partial void OnTypeChanging(CharacteristicType value);
     partial void OnTypeChanged();
     #endregion
@@ -3202 +3202 @@
     }
     
-    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="TinyInt NOT NULL")]
-    public byte Type
+    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="TinyInt NOT NULL", CanBeNull=false)]
+    public CharacteristicType Type
     {
       get

trunk/sources/HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj

@@ -295 +295 @@
     <Compile Include="RunCreation\DataTransfer\StringValue.cs" />
     <Compile Include="RunCreation\DataTransfer\Value.cs" />
+    <Compile Include="RunCreation\MissingProblem.cs" />
     <Compile Include="RunCreation\RunCreationService.cs" />
     <Compile Include="RunCreation\IRunCreationService.cs" />
+    <Compile Include="RunCreation\UnknownCharacteristicType.cs" />
   </ItemGroup>
   <ItemGroup>

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);

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

@@ -68 +68 @@
         entity.Values.Add(Convert.ToEntity(value, entity, DA.ValueNameCategory.Result, okb, binCache));
       return entity;
+    }
+
+    public static DA.CharacteristicValue ToEntity(DT.Value source, DA.OKBDataContext okb, DA.Problem problem, string characteristicName, DA.CharacteristicType type) {
+      if (okb == null || problem == null || string.IsNullOrEmpty(characteristicName) || source == null) throw new ArgumentNullException();
+      var entity = new DA.CharacteristicValue();
+      entity.Problem = problem;
+      entity.DataType = Convert.ToEntity(source.DataType, okb);
+      entity.Characteristic = Convert.ToEntity(characteristicName, type, okb);
+      if (source is DT.BoolValue) {
+        entity.BoolValue = ((DT.BoolValue)source).Value;
+      } else if (source is DT.IntValue) {
+        entity.IntValue = ((DT.IntValue)source).Value;
+      } else if (source is DT.TimeSpanValue) {
+        entity.LongValue = ((DT.TimeSpanValue)source).Value;
+      } else if (source is DT.LongValue) {
+        entity.LongValue = ((DT.LongValue)source).Value;
+      } else if (source is DT.FloatValue) {
+        entity.FloatValue = ((DT.FloatValue)source).Value;
+      } else if (source is DT.DoubleValue) {
+        entity.DoubleValue = ((DT.DoubleValue)source).Value;
+      } else if (source is DT.PercentValue) {
+        entity.DoubleValue = ((DT.PercentValue)source).Value;
+      } else if (source is DT.StringValue) {
+        entity.StringValue = ((DT.StringValue)source).Value;
+      } else {
+        throw new ArgumentException("Unknown characteristic type.", "source");
+      }
+      return entity;
+    }
+
+    private static DA.Characteristic ToEntity(string name, DA.CharacteristicType type, DA.OKBDataContext okb) {
+      if (string.IsNullOrEmpty(name)) return null;
+      var entity = okb.Characteristics.FirstOrDefault(x => (x.Name == name) && (x.Type == type));
+      return entity ?? new DA.Characteristic() { Id = 0, Name = name, Type = type };
     }
 

trunk/sources/HeuristicLab.Services.OKB/3.3/RunCreation/IRunCreationService.cs

@@ -45 +45 @@
     [OperationContract]
     void AddRun(Run run);
+
+    [OperationContract]
+    [FaultContract(typeof(MissingProblem))]
+    [FaultContract(typeof(UnknownCharacteristicType))]
+    void SetCharacteristicValue(long problemId, string characteristicName, Value value);
   }
 }

trunk/sources/HeuristicLab.Services.OKB/3.3/RunCreation/RunCreationService.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Data.Linq;
@@ -135 +136 @@
       }
     }
+
+
+    public void SetCharacteristicValue(long problemId, string characteristicName, DataTransfer.Value value) {
+      roleVerifier.AuthenticateForAnyRole(OKBRoles.OKBAdministrator, OKBRoles.OKBUser);
+
+      using (OKBDataContext okb = new OKBDataContext()) {
+        var problem = okb.Problems.SingleOrDefault(x => x.Id == problemId);
+        if (problem == null) throw new FaultException<MissingProblem>(new MissingProblem("Problem with id {0} cannot be found", problemId));
+        CharacteristicType characteristicType;
+        try {
+          characteristicType = GetCharacteristicType(value);
+        } catch (ArgumentException ex) {
+          throw new FaultException<UnknownCharacteristicType>(new UnknownCharacteristicType(ex.Message));
+        }
+
+        var entity = okb.CharacteristicValues.SingleOrDefault(x => x.Characteristic.Name == characteristicName && x.Characteristic.Type == characteristicType);
+        if (entity != null) {
+          // Update
+          switch (characteristicType) {
+            case CharacteristicType.Bool: entity.BoolValue = ((DataTransfer.BoolValue)value).Value; break;
+            case CharacteristicType.Int: entity.IntValue = ((DataTransfer.IntValue)value).Value; break;
+            case CharacteristicType.Long: entity.LongValue = ((DataTransfer.LongValue)value).Value; break;
+            case CharacteristicType.Float: entity.FloatValue = ((DataTransfer.FloatValue)value).Value; break;
+            case CharacteristicType.Double: entity.DoubleValue = ((DataTransfer.DoubleValue)value).Value; break;
+            case CharacteristicType.Percent: entity.DoubleValue = ((DataTransfer.PercentValue)value).Value; break;
+            case CharacteristicType.String: entity.StringValue = ((DataTransfer.StringValue)value).Value; break;
+            case CharacteristicType.TimeSpan: entity.LongValue = ((DataTransfer.TimeSpanValue)value).Value; break;
+          }
+        } else {
+          // Insert
+          entity = Convert.ToEntity(value, okb, problem, characteristicName, characteristicType);
+          okb.CharacteristicValues.InsertOnSubmit(entity);
+        }
+        okb.SubmitChanges();
+      }
+    }
+
+    private CharacteristicType GetCharacteristicType(DataTransfer.Value source) {
+      if (source is DataTransfer.BoolValue) {
+        return CharacteristicType.Bool;
+      } else if (source is DataTransfer.IntValue) {
+        return CharacteristicType.Int;
+      } else if (source is DataTransfer.TimeSpanValue) {
+        return CharacteristicType.TimeSpan;
+      } else if (source is DataTransfer.LongValue) {
+        return CharacteristicType.Long;
+      } else if (source is DataTransfer.FloatValue) {
+        return CharacteristicType.Float;
+      } else if (source is DataTransfer.DoubleValue) {
+        return CharacteristicType.Double;
+      } else if (source is DataTransfer.PercentValue) {
+        return CharacteristicType.Percent;
+      } else if (source is DataTransfer.StringValue) {
+        return CharacteristicType.String;
+      } else {
+        throw new ArgumentException("Unknown characteristic type.", "source");
+      }
+    }
   }
 }