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

    • Property svn:ignore

      •  

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

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

    r6803 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>
    … …  
    149149    <Compile Include="Manipulators\OnePointShaker.cs" />
    150150    <Compile Include="Manipulators\SymbolicExpressionTreeManipulator.cs" />
     151    <Compile Include="Plugin.cs" />
    151152    <Compile Include="SymbolicExpressionGrammarBase.cs" />
    152153    <Compile Include="SymbolicExpressionGrammar.cs" />
    … …  
    160161    <Compile Include="SymbolicExpressionTreeTerminalNode.cs" />
    161162    <Compile Include="Creators\ProbabilisticTreeCreator.cs" />
    162     <Compile Include="HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs" />
    163163    <Compile Include="Interfaces\Operators\ISymbolicExpressionTreeOperator.cs" />
    164164    <Compile Include="SymbolicExpressionTree.cs" />
    … …  
    178178  <ItemGroup>
    179179    <None Include="HeuristicLab.snk" />
    180     <None Include="HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs.frame" />
    181     <None Include="Properties\AssemblyInfo.frame" />
     180    <None Include="Plugin.cs.frame" />
     181    <None Include="Properties\AssemblyInfo.cs.frame" />
    182182  </ItemGroup>
    183183  <ItemGroup>
    … …  
    185185      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    186186      <Name>HeuristicLab.Analysis-3.3</Name>
     187      <Private>False</Private>
    187188    </ProjectReference>
    188189    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    189190      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    190191      <Name>HeuristicLab.Collections-3.3</Name>
     192      <Private>False</Private>
    191193    </ProjectReference>
    192194    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
    193195      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
    194196      <Name>HeuristicLab.Common.Resources-3.3</Name>
     197      <Private>False</Private>
    195198    </ProjectReference>
    196199    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    197200      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    198201      <Name>HeuristicLab.Common-3.3</Name>
     202      <Private>False</Private>
    199203    </ProjectReference>
    200204    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    201205      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    202206      <Name>HeuristicLab.Core-3.3</Name>
     207      <Private>False</Private>
    203208    </ProjectReference>
    204209    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    205210      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    206211      <Name>HeuristicLab.Data-3.3</Name>
     212      <Private>False</Private>
    207213    </ProjectReference>
    208214    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    209215      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    210216      <Name>HeuristicLab.Operators-3.3</Name>
     217      <Private>False</Private>
    211218    </ProjectReference>
    212219    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    213220      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    214221      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     222      <Private>False</Private>
    215223    </ProjectReference>
    216224    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    217225      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    218226      <Name>HeuristicLab.Optimization-3.3</Name>
     227      <Private>False</Private>
    219228    </ProjectReference>
    220229    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    221230      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    222231      <Name>HeuristicLab.Parameters-3.3</Name>
     232      <Private>False</Private>
    223233    </ProjectReference>
    224234    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    225235      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    226236      <Name>HeuristicLab.Persistence-3.3</Name>
     237      <Private>False</Private>
    227238    </ProjectReference>
    228239    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    229240      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    230241      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     242      <Private>False</Private>
    231243    </ProjectReference>
    232244    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    233245      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    234246      <Name>HeuristicLab.Random-3.3</Name>
     247      <Private>False</Private>
    235248    </ProjectReference>
    236249  </ItemGroup>
    … …  
    267280
    268281call PreBuildEvent.cmd
    269 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabEncodingsSymbolicExpressionTreeEncodingPlugin.cs"</PreBuildEvent>
     282</PreBuildEvent>
    270283  </PropertyGroup>
    271284</Project>
Note: See TracChangeset for help on using the changeset viewer.