Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/28/17 22:10:45 (7 years ago)
Author:
gkronber
Message:

#2560 merged r13501, r13503, r13511, r13513, r13534, r13535, r13540, r13550, r13552, r13593, r13666 from trunk to stable

Location:
stable
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed

  • stable

  • stable/HeuristicLab.Services.OKB.DataAccess/3.3/HeuristicLab.Services.OKB.DataAccess-3.3.csproj

    r11920 r15081  
    128128  </ItemGroup>
    129129  <ItemGroup>
     130    <Compile Include="CharacteristicType.cs" />
    130131    <Compile Include="ValueNameType.cs" />
    131132    <Compile Include="ValueNameCategory.cs" />

  • stable/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml

    r8049 r15081  
    141141      <Column Name="Id" Type="System.Int64" DbType="BigInt NOT NULL IDENTITY" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
    142142      <Column Name="Name" Type="System.String" DbType="NVarChar(200) NOT NULL" CanBeNull="false" />
    143       <Column Name="Type" Type="System.Byte" DbType="TinyInt NOT NULL" CanBeNull="false" />
     143      <Column Name="Type" Type="CharacteristicType" DbType="TinyInt NOT NULL" CanBeNull="false" />
    144144      <Association Name="Characteristic_CharacteristicValue" Member="CharacteristicValues" ThisKey="Id" OtherKey="CharacteristicId" Type="CharacteristicValue" />
    145145    </Type>

  • stable/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml.layout

    r8049 r15081  
    139139      </nestedChildShapes>
    140140    </classShape>
    141     <associationConnector edgePoints="[(3.24167093356531 : 2.65549967447917); (3.24167093356531 : 8.23159912109375); (5.75 : 8.23159912109375)]" fixedFrom="Algorithm" fixedTo="Algorithm">
     141    <associationConnector edgePoints="[(3.24167093356531 : 2.65549967447917); (3.24167093356531 : 8.23159912109375); (5.75 : 8.23159912109375)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    142142      <AssociationMoniker Name="/OKBDataContext/Algorithm/Algorithm_Run" />
    143143      <nodes>
    … …  
    146146      </nodes>
    147147    </associationConnector>
    148     <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">
     148    <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">
    149149      <AssociationMoniker Name="/OKBDataContext/Problem/Problem_Run" />
    150150      <nodes>

  • stable/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.designer.cs

    r11920 r15081  
    33// <auto-generated>
    44//     This code was generated by a tool.
    5 //     Runtime Version:4.0.30319.34014
     5//     Runtime Version:4.0.30319.34209
    66//
    77//     Changes to this file may cause incorrect behavior and will be lost if
    … …  
    31403140    private string _Name;
    31413141   
    3142     private byte _Type;
     3142    private CharacteristicType _Type;
    31433143   
    31443144    private EntitySet<CharacteristicValue> _CharacteristicValues;
    … …  
    31523152    partial void OnNameChanging(string value);
    31533153    partial void OnNameChanged();
    3154     partial void OnTypeChanging(byte value);
     3154    partial void OnTypeChanging(CharacteristicType value);
    31553155    partial void OnTypeChanged();
    31563156    #endregion
    … …  
    32023202    }
    32033203   
    3204     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="TinyInt NOT NULL")]
    3205     public byte Type
     3204    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Type", DbType="TinyInt NOT NULL", CanBeNull=false)]
     3205    public CharacteristicType Type
    32063206    {
    32073207      get
Note: See TracChangeset for help on using the changeset viewer.