Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/11 12:45:26 (13 years ago)
Author:
mkommend
Message:

#1653: Merged new HL solution into the trunk.

Location:
trunk/sources
Files:
2 deleted
3 edited
2 copied

Legend:

Unmodified
Added
Removed

  • trunk/sources

    • Property svn:ignore

      •  

        old new  
         1*.docstates
         2*.psess
        13*.resharper
        24*.suo
         5*.vsp
        36Google.ProtocolBuffers-0.9.1.dll
         7HeuristicLab 3.3.5.1.ReSharper.user
         8HeuristicLab 3.3.6.0.ReSharper.user
        49HeuristicLab.4.5.resharper.user
        510HeuristicLab.resharper.user
        … …  
        813_ReSharper.HeuristicLab
        914_ReSharper.HeuristicLab 3.3
         15_ReSharper.HeuristicLab.ExtLibs
         16bin
        1017protoc.exe
        11 HeuristicLab 3.3.5.1.ReSharper.user
        12 *.psess
        13 *.vsp
        14 *.docstates
        15 bin
        16 HeuristicLab 3.3.6.0.ReSharper.user
         18HeuristicLab.ExtLibs.6.0.ReSharper.user
    • Property svn:mergeinfo changed
      /branches/Restructure trunk solution (added)merged: 6828
      /branches/Trunk (added)merged: 6829,​6831-6833,​6842-6848,​6850,​6865

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3

    • Property svn:ignore

      •  

        old new  
        44HeuristicLabProblemsTravelingSalesmanPlugin.cs
        55*.vs10x
         6Plugin.cs

  • trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/HeuristicLab.Problems.TravelingSalesman-3.3.csproj

    r5163 r6866  
    1919    </UpgradeBackupLocation>
    2020    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
    21     <TargetFrameworkProfile></TargetFrameworkProfile>
     21    <TargetFrameworkProfile>
     22    </TargetFrameworkProfile>
    2223    <PublishUrl>publish\</PublishUrl>
    2324    <Install>true</Install>
    … …  
    4041    <DebugType>full</DebugType>
    4142    <Optimize>false</Optimize>
    42     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4344    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4445    <ErrorReport>prompt</ErrorReport>
    … …  
    5152    <DebugType>pdbonly</DebugType>
    5253    <Optimize>true</Optimize>
    53     <OutputPath>bin\Release\</OutputPath>
     54    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5455    <DefineConstants>TRACE</DefineConstants>
    5556    <ErrorReport>prompt</ErrorReport>
    5657    <WarningLevel>4</WarningLevel>
    57     <DocumentationFile>bin\Release\HeuristicLab.Problems.TravelingSalesman-3.3.xml</DocumentationFile>
     58    <DocumentationFile>
     59    </DocumentationFile>
    5860    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
    5961    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    … …  
    6163  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6264    <DebugSymbols>true</DebugSymbols>
    63     <OutputPath>bin\x86\Debug\</OutputPath>
     65    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6466    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6567    <DebugType>full</DebugType>
    … …  
    6971  </PropertyGroup>
    7072  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    71     <OutputPath>bin\x86\Release\</OutputPath>
     73    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7274    <DefineConstants>TRACE</DefineConstants>
    73     <DocumentationFile>bin\x86\Release\HeuristicLab.Routing.TSP-3.3.xml</DocumentationFile>
     75    <DocumentationFile>
     76    </DocumentationFile>
    7477    <Optimize>true</Optimize>
    7578    <DebugType>pdbonly</DebugType>
    … …  
    8083  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8184    <DebugSymbols>true</DebugSymbols>
    82     <OutputPath>bin\x64\Debug\</OutputPath>
     85    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8386    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8487    <DebugType>full</DebugType>
    … …  
    8891  </PropertyGroup>
    8992  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    90     <OutputPath>bin\x64\Release\</OutputPath>
     93    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9194    <DefineConstants>TRACE</DefineConstants>
    92     <DocumentationFile>bin\x64\Release\HeuristicLab.Routing.TSP-3.3.XML</DocumentationFile>
     95    <DocumentationFile>
     96    </DocumentationFile>
    9397    <Optimize>true</Optimize>
    9498    <DebugType>pdbonly</DebugType>
    … …  
    113117    <Compile Include="Evaluators\TSPEuclideanPathEvaluator.cs" />
    114118    <Compile Include="Evaluators\TSPGeoPathEvaluator.cs" />
    115     <Compile Include="HeuristicLabProblemsTravelingSalesmanPlugin.cs" />
    116119    <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveEuclideanPathEvaluator.cs" />
    117120    <Compile Include="MoveEvaluators\ThreeOpt\TSPTranslocationMoveGeoPathEvaluator.cs" />
    … …  
    122125    <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMovePathEvaluator.cs" />
    123126    <Compile Include="MoveEvaluators\TwoOpt\TSPInversionMoveRoundedEuclideanPathEvaluator.cs" />
     127    <Compile Include="Plugin.cs" />
    124128    <Compile Include="TravelingSalesmanProblem.cs" />
    125129    <Compile Include="TSPLIBTourParser.cs" />
    … …  
    142146      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    143147      <Name>HeuristicLab.Analysis-3.3</Name>
     148      <Private>False</Private>
    144149    </ProjectReference>
    145150    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    146151      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    147152      <Name>HeuristicLab.Collections-3.3</Name>
     153      <Private>False</Private>
    148154    </ProjectReference>
    149155    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    150156      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    151157      <Name>HeuristicLab.Common.Resources-3.3</Name>
     158      <Private>False</Private>
    152159    </ProjectReference>
    153160    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    154161      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    155162      <Name>HeuristicLab.Common-3.3</Name>
     163      <Private>False</Private>
    156164    </ProjectReference>
    157165    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    158166      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    159167      <Name>HeuristicLab.Core-3.3</Name>
     168      <Private>False</Private>
    160169    </ProjectReference>
    161170    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    162171      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    163172      <Name>HeuristicLab.Data-3.3</Name>
     173      <Private>False</Private>
    164174    </ProjectReference>
    165175    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    166176      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    167177      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     178      <Private>False</Private>
    168179    </ProjectReference>
    169180    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    170181      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    171182      <Name>HeuristicLab.Operators-3.3</Name>
     183      <Private>False</Private>
    172184    </ProjectReference>
    173185    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    174186      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    175187      <Name>HeuristicLab.Optimization-3.3</Name>
     188      <Private>False</Private>
    176189    </ProjectReference>
    177190    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    178191      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    179192      <Name>HeuristicLab.Parameters-3.3</Name>
     193      <Private>False</Private>
    180194    </ProjectReference>
    181195    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    182196      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    183197      <Name>HeuristicLab.Persistence-3.3</Name>
     198      <Private>False</Private>
    184199    </ProjectReference>
    185200    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    186201      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    187202      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     203      <Private>False</Private>
    188204    </ProjectReference>
    189205  </ItemGroup>
    190206  <ItemGroup>
    191207    <None Include="HeuristicLab.snk" />
    192     <None Include="HeuristicLabProblemsTravelingSalesmanPlugin.cs.frame" />
    193     <None Include="Properties\AssemblyInfo.frame" />
     208    <None Include="Plugin.cs.frame" />
     209    <None Include="Properties\AssemblyInfo.cs.frame" />
    194210    <None Include="TSPLIB Sample Problems\ch130.opt.tour" />
    195211    <None Include="TSPLIB Sample Problems\ch130.tsp" />
    … …  
    230246
    231247call PreBuildEvent.cmd
    232 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsTravelingSalesmanPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsTravelingSalesmanPlugin.cs"</PreBuildEvent>
     248</PreBuildEvent>
    233249  </PropertyGroup>
    234250</Project>
Note: See TracChangeset for help on using the changeset viewer.