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:
3 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.Encodings.BinaryVectorEncoding/3.3

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.Encodings.BinaryVectorEncoding/3.3/HeuristicLab.Encodings.BinaryVectorEncoding-3.3.csproj

    r6042 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>
    … …  
    5050    <DebugType>pdbonly</DebugType>
    5151    <Optimize>true</Optimize>
    52     <OutputPath>bin\Release\</OutputPath>
     52    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5353    <DefineConstants>TRACE</DefineConstants>
    5454    <ErrorReport>prompt</ErrorReport>
    … …  
    5858  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    5959    <DebugSymbols>true</DebugSymbols>
    60     <OutputPath>bin\x64\Debug\</OutputPath>
     60    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6161    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6262    <DebugType>full</DebugType>
    … …  
    6666  </PropertyGroup>
    6767  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    68     <OutputPath>bin\x64\Release\</OutputPath>
     68    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6969    <DefineConstants>TRACE</DefineConstants>
    7070    <Optimize>true</Optimize>
    … …  
    7676  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7777    <DebugSymbols>true</DebugSymbols>
    78     <OutputPath>bin\x86\Debug\</OutputPath>
     78    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7979    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8080    <DebugType>full</DebugType>
    … …  
    8484  </PropertyGroup>
    8585  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    86     <OutputPath>bin\x86\Release\</OutputPath>
     86    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8787    <DefineConstants>TRACE</DefineConstants>
    8888    <Optimize>true</Optimize>
    … …  
    108108  <ItemGroup>
    109109    <None Include="HeuristicLab.snk" />
    110     <None Include="HeuristicLabEncodingsBinaryVectorEncodingPlugin.cs.frame" />
    111     <None Include="Properties\AssemblyInfo.frame" />
     110    <None Include="Plugin.cs.frame" />
     111    <None Include="Properties\AssemblyInfo.cs.frame" />
    112112  </ItemGroup>
    113113  <ItemGroup>
    … …  
    117117    <Compile Include="Crossovers\SinglePointCrossover.cs" />
    118118    <Compile Include="Crossovers\NPointCrossover.cs" />
    119     <Compile Include="HeuristicLabEncodingsBinaryVectorEncodingPlugin.cs" />
    120119    <Compile Include="BinaryVector.cs" />
    121120    <Compile Include="Interfaces\IBinaryVectorMultiNeighborhoodShakingOperator.cs" />
    … …  
    141140    <Compile Include="Moves\OneBitflipMove\StochasticOneBitflipSingleMoveGenerator.cs" />
    142141    <Compile Include="Moves\OneIndexMove.cs" />
     142    <Compile Include="Plugin.cs" />
    143143    <Compile Include="Properties\AssemblyInfo.cs" />
    144144    <Compile Include="ShakingOperators\BinaryVectorShakingOperator.cs" />
    … …  
    148148      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    149149      <Name>HeuristicLab.Collections-3.3</Name>
     150      <Private>False</Private>
    150151    </ProjectReference>
    151152    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    152153      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    153154      <Name>HeuristicLab.Common-3.3</Name>
     155      <Private>False</Private>
    154156    </ProjectReference>
    155157    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    156158      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    157159      <Name>HeuristicLab.Core-3.3</Name>
     160      <Private>False</Private>
    158161    </ProjectReference>
    159162    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    160163      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    161164      <Name>HeuristicLab.Data-3.3</Name>
     165      <Private>False</Private>
    162166    </ProjectReference>
    163167    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    164168      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    165169      <Name>HeuristicLab.Operators-3.3</Name>
     170      <Private>False</Private>
    166171    </ProjectReference>
    167172    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    168173      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    169174      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     175      <Private>False</Private>
    170176    </ProjectReference>
    171177    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    172178      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    173179      <Name>HeuristicLab.Optimization-3.3</Name>
     180      <Private>False</Private>
    174181    </ProjectReference>
    175182    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    176183      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    177184      <Name>HeuristicLab.Parameters-3.3</Name>
     185      <Private>False</Private>
    178186    </ProjectReference>
    179187    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    180188      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    181189      <Name>HeuristicLab.Persistence-3.3</Name>
     190      <Private>False</Private>
    182191    </ProjectReference>
    183192    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    184193      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    185194      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     195      <Private>False</Private>
    186196    </ProjectReference>
    187197  </ItemGroup>
    … …  
    219229
    220230call PreBuildEvent.cmd
    221 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabEncodingsBinaryVectorEncodingPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabEncodingsBinaryVectorEncodingPlugin.cs"</PreBuildEvent>
     231</PreBuildEvent>
    222232  </PropertyGroup>
    223233</Project>
Note: See TracChangeset for help on using the changeset viewer.