Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5478


Ignore:
Timestamp:
02/16/11 03:20:57 (14 years ago)
Author:
swagner
Message:

Worked on OKB (#1174)

Location:
branches/OKB (trunk integration)
Files:
22 added
5 edited

Legend:

Unmodified
Added
Removed

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml

    r5397 r5478  
    3636      <Column Name="Name" Type="System.String" DbType="NVarChar(200) NOT NULL" CanBeNull="false" />
    3737      <Column Name="Description" Type="System.String" DbType="NVarChar(MAX)" CanBeNull="true" />
    38       <Association Name="Platform_DataType" Member="DataTypes" ThisKey="Id" OtherKey="PlatformId" Type="DataType" />
    3938      <Association Name="Platform_Algorithm" Member="Algorithms" ThisKey="Id" OtherKey="PlatformId" Type="Algorithm" />
    4039      <Association Name="Platform_Problem" Member="Problems" ThisKey="Id" OtherKey="PlatformId" Type="Problem" />
    … …  
    4443    <Type Name="DataType">
    4544      <Column Name="Id" Type="System.Int64" DbType="BigInt NOT NULL IDENTITY" IsPrimaryKey="true" IsDbGenerated="true" CanBeNull="false" />
    46       <Column Name="PlatformId" Type="System.Int64" DbType="BigInt NOT NULL" CanBeNull="false" />
    4745      <Column Name="Name" Type="System.String" DbType="NVarChar(200) NOT NULL" CanBeNull="false" />
    4846      <Column Name="TypeName" Type="System.String" DbType="NVarChar(MAX) NOT NULL" CanBeNull="false" />
    … …  
    5149      <Association Name="DataType_Value" Member="Values" ThisKey="Id" OtherKey="DataTypeId" Type="Value" />
    5250      <Association Name="DataType_CharacteristicValue" Member="CharacteristicValues" ThisKey="Id" OtherKey="DataTypeId" Type="CharacteristicValue" />
    53       <Association Name="Platform_DataType" Member="Platform" ThisKey="PlatformId" OtherKey="Id" Type="Platform" IsForeignKey="true" />
    5451    </Type>
    5552  </Table>

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.dbml.layout

    r5459 r5478  
    3333      </nestedChildShapes>
    3434    </classShape>
    35     <classShape Id="34f5a12b-f109-4606-baf8-6ddfde7c1b34" absoluteBounds="7, 2.125, 2, 1.5785953776041666">
     35    <classShape Id="34f5a12b-f109-4606-baf8-6ddfde7c1b34" absoluteBounds="7, 2.125, 2, 1.3862939453125">
    3636      <DataClassMoniker Name="/OKBDataContext/DataType" />
    3737      <nestedChildShapes>
    38         <elementListCompartment Id="1dacac40-e283-48e9-a98d-dddbc6b4fd48" absoluteBounds="7.0150000000000006, 2.585, 1.9700000000000002, 1.0185953776041665" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
    39       </nestedChildShapes>
    40     </classShape>
    41     <associationConnector edgePoints="[(8 : 1.8862939453125); (8 : 2.125)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    42       <AssociationMoniker Name="/OKBDataContext/Platform/Platform_DataType" />
    43       <nodes>
    44         <classShapeMoniker Id="42a9e8c0-3168-43f0-a31f-54d1558bd4c2" />
    45         <classShapeMoniker Id="34f5a12b-f109-4606-baf8-6ddfde7c1b34" />
    46       </nodes>
    47     </associationConnector>
     38        <elementListCompartment Id="1dacac40-e283-48e9-a98d-dddbc6b4fd48" absoluteBounds="7.0150000000000006, 2.585, 1.9700000000000002, 0.8262939453125" name="DataPropertiesCompartment" titleTextColor="Black" itemTextColor="Black" />
     39      </nestedChildShapes>
     40    </classShape>
    4841    <classShape Id="c75911bf-ae6d-421c-9219-e027c3059390" absoluteBounds="3.5, 4, 2, 1.5785953776041666">
    4942      <DataClassMoniker Name="/OKBDataContext/ValueName" />
    … …  
    5851      </nestedChildShapes>
    5952    </classShape>
    60     <associationConnector edgePoints="[(2.75 : 2.39024983723958); (2.5 : 2.39024983723958)]" fixedFrom="Algorithm" fixedTo="Algorithm">
     53    <associationConnector edgePoints="[(2.75 : 2.39024983723958); (2.5 : 2.39024983723958)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    6154      <AssociationMoniker Name="/OKBDataContext/Algorithm/Algorithm_AlgorithmUser" />
    6255      <nodes>
    … …  
    7265      </nodes>
    7366    </associationConnector>
    74     <associationConnector edgePoints="[(7 : 2.39024983723958); (4.75 : 2.39024983723958)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     67    <associationConnector edgePoints="[(7 : 2.39024983723958); (4.75 : 2.39024983723958)]" fixedFrom="Algorithm" fixedTo="Algorithm">
    7568      <AssociationMoniker Name="/OKBDataContext/DataType/DataType_Algorithm" />
    7669      <nodes>
    … …  
    9285      </nestedChildShapes>
    9386    </classShape>
    94     <associationConnector edgePoints="[(13.25 : 2.39024983723958); (13.5 : 2.39024983723958)]" fixedFrom="Algorithm" fixedTo="Algorithm">
     87    <associationConnector edgePoints="[(13.25 : 2.39024983723958); (13.5 : 2.39024983723958)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    9588      <AssociationMoniker Name="/OKBDataContext/Problem/Problem_ProblemUser" />
    9689      <nodes>
    … …  
    9992      </nodes>
    10093    </associationConnector>
    101     <associationConnector edgePoints="[(9 : 2.39024983723958); (11.25 : 2.39024983723958)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     94    <associationConnector edgePoints="[(9 : 2.39024983723958); (11.25 : 2.39024983723958)]" fixedFrom="Algorithm" fixedTo="Algorithm">
    10295      <AssociationMoniker Name="/OKBDataContext/DataType/DataType_Problem" />
    10396      <nodes>
    … …  
    126119      </nestedChildShapes>
    127120    </classShape>
    128     <associationConnector edgePoints="[(7 : 10.3181469726562); (2.98333686713063 : 10.3181469726562); (2.98333686713063 : 2.65549967447917)]" fixedFrom="Algorithm" fixedTo="Algorithm">
     121    <associationConnector edgePoints="[(7 : 10.3181469726562); (2.98333686713063 : 10.3181469726562); (2.98333686713063 : 2.65549967447917)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    129122      <AssociationMoniker Name="/OKBDataContext/BinaryData/BinaryData_Algorithm" />
    130123      <nodes>
    … …  
    133126      </nodes>
    134127    </associationConnector>
    135     <associationConnector edgePoints="[(9 : 10.3181469726562); (13.0131477507419 : 10.3181469726562); (13.0131477507419 : 2.65549967447917)]" fixedFrom="Algorithm" fixedTo="Algorithm">
     128    <associationConnector edgePoints="[(9 : 10.3181469726562); (13.0131477507419 : 10.3181469726562); (13.0131477507419 : 2.65549967447917)]" fixedFrom="NotFixed" fixedTo="NotFixed">
    136129      <AssociationMoniker Name="/OKBDataContext/BinaryData/BinaryData_Problem" />
    137130      <nodes>
    … …  
    173166      </nodes>
    174167    </associationConnector>
    175     <associationConnector edgePoints="[(7 : 3.07568669800201); (6.6959048132675 : 3.07568669800201); (6.6959048132675 : 4)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     168    <associationConnector edgePoints="[(7.273878302532 : 3.5112939453125); (7.273878302532 : 4)]" fixedFrom="Caller" fixedTo="Algorithm">
    176169      <AssociationMoniker Name="/OKBDataContext/DataType/DataType_Value" />
    177170      <nodes>
    … …  
    213206      </nodes>
    214207    </associationConnector>
    215     <associationConnector edgePoints="[(9 : 3.05278498857512); (9.24152226977744 : 3.05278498857512); (9.24152226977744 : 4)]" fixedFrom="NotFixed" fixedTo="NotFixed">
     208    <associationConnector edgePoints="[(8.68784173221247 : 3.5112939453125); (8.68784173221247 : 4)]" fixedFrom="Caller" fixedTo="Algorithm">
    216209      <AssociationMoniker Name="/OKBDataContext/DataType/DataType_CharacteristicValue" />
    217210      <nodes>

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB.DataAccess/3.3/OKB.designer.cs

    r5397 r5478  
    760760    private string _Description;
    761761   
    762     private EntitySet<DataType> _DataTypes;
    763    
    764762    private EntitySet<Algorithm> _Algorithms;
    765763   
    … …  
    780778    public Platform()
    781779    {
    782       this._DataTypes = new EntitySet<DataType>(new Action<DataType>(this.attach_DataTypes), new Action<DataType>(this.detach_DataTypes));
    783780      this._Algorithms = new EntitySet<Algorithm>(new Action<Algorithm>(this.attach_Algorithms), new Action<Algorithm>(this.detach_Algorithms));
    784781      this._Problems = new EntitySet<Problem>(new Action<Problem>(this.attach_Problems), new Action<Problem>(this.detach_Problems));
    … …  
    846843    }
    847844   
    848     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Platform_DataType", Storage="_DataTypes", ThisKey="Id", OtherKey="PlatformId")]
    849     public EntitySet<DataType> DataTypes
    850     {
    851       get
    852       {
    853         return this._DataTypes;
    854       }
    855       set
    856       {
    857         this._DataTypes.Assign(value);
    858       }
    859     }
    860    
    861845    [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Platform_Algorithm", Storage="_Algorithms", ThisKey="Id", OtherKey="PlatformId")]
    862846    public EntitySet<Algorithm> Algorithms
    … …  
    903887        this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
    904888      }
    905     }
    906    
    907     private void attach_DataTypes(DataType entity)
    908     {
    909       this.SendPropertyChanging();
    910       entity.Platform = this;
    911     }
    912    
    913     private void detach_DataTypes(DataType entity)
    914     {
    915       this.SendPropertyChanging();
    916       entity.Platform = null;
    917889    }
    918890   
    … …  
    950922    private long _Id;
    951923   
    952     private long _PlatformId;
    953    
    954924    private string _Name;
    955925   
    … …  
    963933   
    964934    private EntitySet<CharacteristicValue> _CharacteristicValues;
    965    
    966     private EntityRef<Platform> _Platform;
    967935   
    968936    #region Extensibility Method Definitions
    … …  
    972940    partial void OnIdChanging(long value);
    973941    partial void OnIdChanged();
    974     partial void OnPlatformIdChanging(long value);
    975     partial void OnPlatformIdChanged();
    976942    partial void OnNameChanging(string value);
    977943    partial void OnNameChanged();
    … …  
    986952      this._Values = new EntitySet<Value>(new Action<Value>(this.attach_Values), new Action<Value>(this.detach_Values));
    987953      this._CharacteristicValues = new EntitySet<CharacteristicValue>(new Action<CharacteristicValue>(this.attach_CharacteristicValues), new Action<CharacteristicValue>(this.detach_CharacteristicValues));
    988       this._Platform = default(EntityRef<Platform>);
    989954      OnCreated();
    990955    }
    … …  
    1010975    }
    1011976   
    1012     [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PlatformId", DbType="BigInt NOT NULL")]
    1013     public long PlatformId
    1014     {
    1015       get
    1016       {
    1017         return this._PlatformId;
    1018       }
    1019       set
    1020       {
    1021         if ((this._PlatformId != value))
    1022         {
    1023           if (this._Platform.HasLoadedOrAssignedValue)
    1024           {
    1025             throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
    1026           }
    1027           this.OnPlatformIdChanging(value);
    1028           this.SendPropertyChanging();
    1029           this._PlatformId = value;
    1030           this.SendPropertyChanged("PlatformId");
    1031           this.OnPlatformIdChanged();
    1032         }
    1033       }
    1034     }
    1035    
    1036977    [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200) NOT NULL", CanBeNull=false)]
    1037978    public string Name
    … …  
    11231064      {
    11241065        this._CharacteristicValues.Assign(value);
    1125       }
    1126     }
    1127    
    1128     [global::System.Data.Linq.Mapping.AssociationAttribute(Name="Platform_DataType", Storage="_Platform", ThisKey="PlatformId", OtherKey="Id", IsForeignKey=true)]
    1129     public Platform Platform
    1130     {
    1131       get
    1132       {
    1133         return this._Platform.Entity;
    1134       }
    1135       set
    1136       {
    1137         Platform previousValue = this._Platform.Entity;
    1138         if (((previousValue != value)
    1139               || (this._Platform.HasLoadedOrAssignedValue == false)))
    1140         {
    1141           this.SendPropertyChanging();
    1142           if ((previousValue != null))
    1143           {
    1144             this._Platform.Entity = null;
    1145             previousValue.DataTypes.Remove(this);
    1146           }
    1147           this._Platform.Entity = value;
    1148           if ((value != null))
    1149           {
    1150             value.DataTypes.Add(this);
    1151             this._PlatformId = value.Id;
    1152           }
    1153           else
    1154           {
    1155             this._PlatformId = default(long);
    1156           }
    1157           this.SendPropertyChanged("Platform");
    1158         }
    11591066      }
    11601067    }

  • branches/OKB (trunk integration)/HeuristicLab.Services.OKB/3.3/HeuristicLab.Services.OKB-3.3.csproj

    r5389 r5478  
    164164    <Compile Include="Interfaces\IFilter.cs" />
    165165    <Compile Include="Properties\AssemblyInfo.cs" />
     166    <Compile Include="RunCreation\Convert.cs" />
     167    <Compile Include="RunCreation\DataTransfer\Algorithm.cs" />
     168    <Compile Include="RunCreation\DataTransfer\AlgorithmClass.cs" />
     169    <Compile Include="RunCreation\DataTransfer\BinaryValue.cs" />
     170    <Compile Include="RunCreation\DataTransfer\BoolValue.cs" />
     171    <Compile Include="RunCreation\DataTransfer\DataType.cs" />
     172    <Compile Include="RunCreation\DataTransfer\DoubleValue.cs" />
     173    <Compile Include="RunCreation\DataTransfer\FloatValue.cs" />
     174    <Compile Include="RunCreation\DataTransfer\IntValue.cs" />
     175    <Compile Include="RunCreation\DataTransfer\LongValue.cs" />
     176    <Compile Include="RunCreation\DataTransfer\Problem.cs" />
     177    <Compile Include="RunCreation\DataTransfer\ProblemClass.cs" />
     178    <Compile Include="RunCreation\DataTransfer\Run.cs" />
     179    <Compile Include="RunCreation\DataTransfer\StringValue.cs" />
     180    <Compile Include="RunCreation\DataTransfer\Value.cs" />
     181    <Compile Include="RunCreation\RunCreationService.cs" />
     182    <Compile Include="RunCreation\IRunCreationService.cs" />
    166183  </ItemGroup>
    167184  <ItemGroup>
    … …  
    181198      <Name>HeuristicLab.Services.OKB.DataTransfer-3.3</Name>
    182199    </ProjectReference>
     200  </ItemGroup>
     201  <ItemGroup>
     202    <Folder Include="Administration\" />
     203    <Folder Include="Authentication\" />
     204    <Folder Include="Query\" />
     205  </ItemGroup>
     206  <ItemGroup>
     207    <Service Include="{3259AA49-8AA1-44D3-9025-A0B520596A8C}" />
    183208  </ItemGroup>
    184209  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
Note: See TracChangeset for help on using the changeset viewer.