Changeset 7006


Ignore:
Timestamp:
11/16/11 17:37:20 (8 years ago)
Author:
ascheibe
Message:

#1659 merged benchmarking algorithms branch back to trunk

Location:
trunk
Files:
4 edited
22 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/sources

  • trunk/sources/HeuristicLab 3.3.sln

    r6976 r7006  
    311311EndProject
    312312Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Clients.Hive.Administrator-3.3", "HeuristicLab.Clients.Hive.Administrator\3.3\HeuristicLab.Clients.Hive.Administrator-3.3.csproj", "{5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}"
     313EndProject
     314Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.Benchmarks-3.3", "HeuristicLab.Algorithms.Benchmarks\3.3\HeuristicLab.Algorithms.Benchmarks-3.3.csproj", "{068C70A7-8CAF-4AB6-8721-4564D62292BC}"
     315EndProject
     316Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.Benchmarks.Views-3.3", "HeuristicLab.Algorithms.Benchmarks.Views\3.3\HeuristicLab.Algorithms.Benchmarks.Views-3.3.csproj", "{3C906172-E044-4DF0-B4FD-AA21192D5D3E}"
    313317EndProject
    314318Global
     
    15191523    {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Release|x86.ActiveCfg = Release|x86
    15201524    {5211F1AD-BBA2-4C62-8749-DCA0A25CF5D8}.Release|x86.Build.0 = Release|x86
     1525    {068C70A7-8CAF-4AB6-8721-4564D62292BC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1526    {068C70A7-8CAF-4AB6-8721-4564D62292BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1527    {068C70A7-8CAF-4AB6-8721-4564D62292BC}.Debug|x64.ActiveCfg = Debug|Any CPU
     1528    {068C70A7-8CAF-4AB6-8721-4564D62292BC}.Debug|x86.ActiveCfg = Debug|Any CPU
     1529    {068C70A7-8CAF-4AB6-8721-4564D62292BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1530    {068C70A7-8CAF-4AB6-8721-4564D62292BC}.Release|Any CPU.Build.0 = Release|Any CPU
     1531    {068C70A7-8CAF-4AB6-8721-4564D62292BC}.Release|x64.ActiveCfg = Release|Any CPU
     1532    {068C70A7-8CAF-4AB6-8721-4564D62292BC}.Release|x86.ActiveCfg = Release|Any CPU
     1533    {3C906172-E044-4DF0-B4FD-AA21192D5D3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1534    {3C906172-E044-4DF0-B4FD-AA21192D5D3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1535    {3C906172-E044-4DF0-B4FD-AA21192D5D3E}.Debug|x64.ActiveCfg = Debug|Any CPU
     1536    {3C906172-E044-4DF0-B4FD-AA21192D5D3E}.Debug|x86.ActiveCfg = Debug|Any CPU
     1537    {3C906172-E044-4DF0-B4FD-AA21192D5D3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1538    {3C906172-E044-4DF0-B4FD-AA21192D5D3E}.Release|Any CPU.Build.0 = Release|Any CPU
     1539    {3C906172-E044-4DF0-B4FD-AA21192D5D3E}.Release|x64.ActiveCfg = Release|Any CPU
     1540    {3C906172-E044-4DF0-B4FD-AA21192D5D3E}.Release|x86.ActiveCfg = Release|Any CPU
    15211541  EndGlobalSection
    15221542  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r6994 r7006  
    570570  </ItemGroup>
    571571  <ItemGroup>
     572    <ProjectReference Include="..\HeuristicLab.Algorithms.Benchmarks.Views\3.3\HeuristicLab.Algorithms.Benchmarks.Views-3.3.csproj">
     573      <Project>{3C906172-E044-4DF0-B4FD-AA21192D5D3E}</Project>
     574      <Name>HeuristicLab.Algorithms.Benchmarks.Views-3.3</Name>
     575    </ProjectReference>
     576    <ProjectReference Include="..\HeuristicLab.Algorithms.Benchmarks\3.3\HeuristicLab.Algorithms.Benchmarks-3.3.csproj">
     577      <Project>{068C70A7-8CAF-4AB6-8721-4564D62292BC}</Project>
     578      <Name>HeuristicLab.Algorithms.Benchmarks-3.3</Name>
     579    </ProjectReference>
    572580    <ProjectReference Include="..\HeuristicLab.Algorithms.DataAnalysis.Views\3.4\HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj">
    573581      <Project>{A2330DB0-413D-4424-B4E6-591118E2B9F8}</Project>
Note: See TracChangeset for help on using the changeset viewer.