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.SymbolicExpressionTreeEncoding/3.3

    • Property svn:ignore

      •  

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

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

    r5416 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>
    … …  
    5151    <DebugType>pdbonly</DebugType>
    5252    <Optimize>true</Optimize>
    53     <OutputPath>bin\Release\</OutputPath>
     53    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5454    <DefineConstants>TRACE</DefineConstants>
    5555    <ErrorReport>prompt</ErrorReport>
    … …  
    5959  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    6060    <DebugSymbols>true</DebugSymbols>
    61     <OutputPath>bin\x64\Debug\</OutputPath>
     61    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6262    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6363    <DebugType>full</DebugType>
    … …  
    6767  </PropertyGroup>
    6868  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    69     <OutputPath>bin\x64\Release\</OutputPath>
     69    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7070    <DefineConstants>TRACE</DefineConstants>
    7171    <Optimize>true</Optimize>
    … …  
    7777  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    7878    <DebugSymbols>true</DebugSymbols>
    79     <OutputPath>bin\x86\Debug\</OutputPath>
     79    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8080    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8181    <DebugType>full</DebugType>
    … …  
    8585  </PropertyGroup>
    8686  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    87     <OutputPath>bin\x86\Release\</OutputPath>
     87    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8888    <DefineConstants>TRACE</DefineConstants>
    8989    <Optimize>true</Optimize>
    … …  
    140140    <Compile Include="Manipulators\OnePointShaker.cs" />
    141141    <Compile Include="Manipulators\SymbolicExpressionTreeManipulator.cs" />
     142    <Compile Include="Plugin.cs" />
    142143    <Compile Include="SymbolicExpressionTreeGrammar.cs" />
    143144    <Compile Include="SymbolicExpressionTreeTopLevelNode.cs" />
    … …  
    154155    <Compile Include="Interfaces\ISymbolicExpressionGrammar.cs" />
    155156    <Compile Include="Creators\ProbabilisticTreeCreator.cs" />
    156     <Compile Include="HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs" />
    157157    <Compile Include="Interfaces\ISymbolicExpressionTreeOperator.cs" />
    158158    <Compile Include="SymbolicExpressionTree.cs" />
    … …  
    172172  <ItemGroup>
    173173    <None Include="HeuristicLab.snk" />
    174     <None Include="HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs.frame" />
    175     <None Include="Properties\AssemblyInfo.frame" />
     174    <None Include="Plugin.cs.frame" />
     175    <None Include="Properties\AssemblyInfo.cs.frame" />
    176176  </ItemGroup>
    177177  <ItemGroup>
    … …  
    179179      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    180180      <Name>HeuristicLab.Analysis-3.3</Name>
     181      <Private>False</Private>
    181182    </ProjectReference>
    182183    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    183184      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    184185      <Name>HeuristicLab.Collections-3.3</Name>
     186      <Private>False</Private>
    185187    </ProjectReference>
    186188    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    187189      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    188190      <Name>HeuristicLab.Common.Resources-3.3</Name>
     191      <Private>False</Private>
    189192    </ProjectReference>
    190193    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    191194      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    192195      <Name>HeuristicLab.Common-3.3</Name>
     196      <Private>False</Private>
    193197    </ProjectReference>
    194198    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    195199      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    196200      <Name>HeuristicLab.Core-3.3</Name>
     201      <Private>False</Private>
    197202    </ProjectReference>
    198203    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    199204      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    200205      <Name>HeuristicLab.Data-3.3</Name>
     206      <Private>False</Private>
    201207    </ProjectReference>
    202208    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    203209      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    204210      <Name>HeuristicLab.Operators-3.3</Name>
     211      <Private>False</Private>
    205212    </ProjectReference>
    206213    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    207214      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    208215      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     216      <Private>False</Private>
    209217    </ProjectReference>
    210218    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    211219      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    212220      <Name>HeuristicLab.Optimization-3.3</Name>
     221      <Private>False</Private>
    213222    </ProjectReference>
    214223    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    215224      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    216225      <Name>HeuristicLab.Parameters-3.3</Name>
     226      <Private>False</Private>
    217227    </ProjectReference>
    218228    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    219229      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    220230      <Name>HeuristicLab.Persistence-3.3</Name>
     231      <Private>False</Private>
    221232    </ProjectReference>
    222233    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    223234      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    224235      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     236      <Private>False</Private>
    225237    </ProjectReference>
    226238    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    227239      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    228240      <Name>HeuristicLab.Random-3.3</Name>
     241      <Private>False</Private>
    229242    </ProjectReference>
    230243  </ItemGroup>
    … …  
    261274
    262275call PreBuildEvent.cmd
    263 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs"</PreBuildEvent>
     276</PreBuildEvent>
    264277  </PropertyGroup>
    265278</Project>
Note: See TracChangeset for help on using the changeset viewer.