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
4 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.VehicleRouting

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

    • Property svn:ignore

      •  

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

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

    r6600 r6866  
    4141    <DebugType>full</DebugType>
    4242    <Optimize>false</Optimize>
    43     <OutputPath>bin\Debug\</OutputPath>
     43    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4444    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4545    <ErrorReport>prompt</ErrorReport>
    … …  
    5252    <DebugType>pdbonly</DebugType>
    5353    <Optimize>true</Optimize>
    54     <OutputPath>bin\Release\</OutputPath>
     54    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5555    <DefineConstants>TRACE</DefineConstants>
    5656    <ErrorReport>prompt</ErrorReport>
    5757    <WarningLevel>4</WarningLevel>
    58     <DocumentationFile>bin\Release\HeuristicLab.Problems.VehicleRouting-3.3.xml</DocumentationFile>
     58    <DocumentationFile>
     59    </DocumentationFile>
    5960    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
    6061    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    … …  
    6263  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6364    <DebugSymbols>true</DebugSymbols>
    64     <OutputPath>bin\x86\Debug\</OutputPath>
     65    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6566    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6667    <DebugType>full</DebugType>
    … …  
    7071  </PropertyGroup>
    7172  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    72     <OutputPath>bin\x86\Release\</OutputPath>
     73    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7374    <DefineConstants>TRACE</DefineConstants>
    74     <DocumentationFile>bin\x86\Release\HeuristicLab.Routing.TSP-3.3.xml</DocumentationFile>
     75    <DocumentationFile>
     76    </DocumentationFile>
    7577    <Optimize>true</Optimize>
    7678    <DebugType>pdbonly</DebugType>
    … …  
    8183  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    8284    <DebugSymbols>true</DebugSymbols>
    83     <OutputPath>bin\x64\Debug\</OutputPath>
     85    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8486    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8587    <DebugType>full</DebugType>
    … …  
    8991  </PropertyGroup>
    9092  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    91     <OutputPath>bin\x64\Release\</OutputPath>
     93    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    9294    <DefineConstants>TRACE</DefineConstants>
    93     <DocumentationFile>bin\x64\Release\HeuristicLab.Routing.TSP-3.3.XML</DocumentationFile>
     95    <DocumentationFile>
     96    </DocumentationFile>
    9497    <Optimize>true</Optimize>
    9598    <DebugType>pdbonly</DebugType>
    … …  
    117120    <Compile Include="Encodings\Potvin\Manipulators\PotvinLocalSearchManipulator.cs" />
    118121    <Compile Include="Interfaces\IVRPMultiNeighborhoodShakingOperator.cs" />
     122    <Compile Include="Plugin.cs" />
    119123    <Compile Include="ShakingOperators\VehicleRoutingShakingOperator.cs" />
    120124    <Compile Include="SolutionParser.cs" />
    … …  
    212216    <Compile Include="Encodings\VRPManipulator.cs" />
    213217    <Compile Include="Evaluators\VRPEvaluator.cs" />
    214     <Compile Include="HeuristicLabProblemsVehicleRoutingPlugin.cs" />
    215218    <Compile Include="Interfaces\IVRPCrossover.cs" />
    216219    <Compile Include="Interfaces\IVRPEncoding.cs" />
    … …  
    232235      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    233236      <Name>HeuristicLab.Analysis-3.3</Name>
     237      <Private>False</Private>
    234238    </ProjectReference>
    235239    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    236240      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    237241      <Name>HeuristicLab.Collections-3.3</Name>
     242      <Private>False</Private>
    238243    </ProjectReference>
    239244    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    240245      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    241246      <Name>HeuristicLab.Common.Resources-3.3</Name>
     247      <Private>False</Private>
    242248    </ProjectReference>
    243249    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    244250      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    245251      <Name>HeuristicLab.Common-3.3</Name>
     252      <Private>False</Private>
    246253    </ProjectReference>
    247254    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    248255      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    249256      <Name>HeuristicLab.Core-3.3</Name>
     257      <Private>False</Private>
    250258    </ProjectReference>
    251259    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    252260      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    253261      <Name>HeuristicLab.Data-3.3</Name>
     262      <Private>False</Private>
    254263    </ProjectReference>
    255264    <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">
    256265      <Project>{DBECB8B0-B166-4133-BAF1-ED67C3FD7FCA}</Project>
    257266      <Name>HeuristicLab.Encodings.PermutationEncoding-3.3</Name>
     267      <Private>False</Private>
    258268    </ProjectReference>
    259269    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    260270      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    261271      <Name>HeuristicLab.Operators-3.3</Name>
     272      <Private>False</Private>
    262273    </ProjectReference>
    263274    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    264275      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    265276      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     277      <Private>False</Private>
    266278    </ProjectReference>
    267279    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    268280      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    269281      <Name>HeuristicLab.Optimization-3.3</Name>
     282      <Private>False</Private>
    270283    </ProjectReference>
    271284    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    272285      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    273286      <Name>HeuristicLab.Parameters-3.3</Name>
     287      <Private>False</Private>
    274288    </ProjectReference>
    275289    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    276290      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    277291      <Name>HeuristicLab.Persistence-3.3</Name>
     292      <Private>False</Private>
    278293    </ProjectReference>
    279294    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    280295      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    281296      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     297      <Private>False</Private>
    282298    </ProjectReference>
    283299  </ItemGroup>
    284300  <ItemGroup>
    285301    <None Include="HeuristicLab.snk" />
    286     <None Include="HeuristicLabProblemsVehicleRoutingPlugin.cs.frame" />
    287     <None Include="Properties\AssemblyInfo.frame" />
     302    <None Include="Plugin.cs.frame" />
     303    <None Include="Properties\AssemblyInfo.cs.frame" />
    288304  </ItemGroup>
    289305  <ItemGroup>
    … …  
    320336
    321337call PreBuildEvent.cmd
    322 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabProblemsVehicleRoutingPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabProblemsVehicleRoutingPlugin.cs"</PreBuildEvent>
     338</PreBuildEvent>
    323339  </PropertyGroup>
    324340</Project>
Note: See TracChangeset for help on using the changeset viewer.