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

    • Property svn:ignore

      •  

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

  • trunk/sources/HeuristicLab.Encodings.RealVectorEncoding/3.3/HeuristicLab.Encodings.RealVectorEncoding-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>
    5555    <WarningLevel>4</WarningLevel>
    56     <DocumentationFile>bin\Release\HeuristicLab.Encodings.RealVectorEncoding-3.3.xml</DocumentationFile>
     56    <DocumentationFile>
     57    </DocumentationFile>
    5758    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    5859  </PropertyGroup>
    5960  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    6061    <DebugSymbols>true</DebugSymbols>
    61     <OutputPath>bin\x86\Debug\</OutputPath>
     62    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6263    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6364    <DebugType>full</DebugType>
    … …  
    6768  </PropertyGroup>
    6869  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    69     <OutputPath>bin\x86\Release\</OutputPath>
     70    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7071    <DefineConstants>TRACE</DefineConstants>
    71     <DocumentationFile>bin\x86\Release\HeuristicLab.Encodings.RealVectorEncoding-3.3.xml</DocumentationFile>
     72    <DocumentationFile>
     73    </DocumentationFile>
    7274    <Optimize>true</Optimize>
    7375    <DebugType>pdbonly</DebugType>
    … …  
    7880  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7981    <DebugSymbols>true</DebugSymbols>
    80     <OutputPath>bin\x64\Debug\</OutputPath>
     82    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8183    <DefineConstants>DEBUG;TRACE</DefineConstants>
    8284    <DebugType>full</DebugType>
    … …  
    8688  </PropertyGroup>
    8789  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    88     <OutputPath>bin\x64\Release\</OutputPath>
     90    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8991    <DefineConstants>TRACE</DefineConstants>
    90     <DocumentationFile>bin\x64\Release\HeuristicLab.Encodings.RealVectorEncoding-3.3.xml</DocumentationFile>
     92    <DocumentationFile>
     93    </DocumentationFile>
    9194    <Optimize>true</Optimize>
    9295    <DebugType>pdbonly</DebugType>
    … …  
    121124    <Compile Include="ParticleOperators\RealVectorSwarmUpdater.cs" />
    122125    <Compile Include="ParticleOperators\RealVectorTotallyConnectedParticleUpdater.cs" />
     126    <Compile Include="Plugin.cs" />
    123127    <Compile Include="RealVectorCreator.cs" />
    124128    <Compile Include="RealVectorCrossover.cs" />
    … …  
    140144    <Compile Include="Crossovers\UniformAllPositionsArithmeticCrossover.cs" />
    141145    <Compile Include="Crossovers\UniformSomePositionsArithmeticCrossover.cs" />
    142     <Compile Include="HeuristicLabEncodingsRealVectorEncodingPlugin.cs" />
    143146    <Compile Include="Interfaces\IRealVectorStdDevStrategyParameterCreator.cs" />
    144147    <Compile Include="Interfaces\IRealVectorStdDevStrategyParameterCrossover.cs" />
    … …  
    174177    <Compile Include="StrategyParameters\StdDevStrategyVectorManipulator.cs" />
    175178    <None Include="HeuristicLab.snk" />
    176     <None Include="HeuristicLabEncodingsRealVectorEncodingPlugin.cs.frame" />
    177     <None Include="Properties\AssemblyInfo.frame" />
     179    <None Include="Plugin.cs.frame" />
     180    <None Include="Properties\AssemblyInfo.cs.frame" />
    178181  </ItemGroup>
    179182  <ItemGroup>
    … …  
    181184      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    182185      <Name>HeuristicLab.Collections-3.3</Name>
     186      <Private>False</Private>
    183187    </ProjectReference>
    184188    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    185189      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    186190      <Name>HeuristicLab.Common-3.3</Name>
     191      <Private>False</Private>
    187192    </ProjectReference>
    188193    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    189194      <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
    190195      <Name>HeuristicLab.Core-3.3</Name>
     196      <Private>False</Private>
    191197    </ProjectReference>
    192198    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    193199      <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>
    194200      <Name>HeuristicLab.Data-3.3</Name>
     201      <Private>False</Private>
    195202    </ProjectReference>
    196203    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    197204      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    198205      <Name>HeuristicLab.Operators-3.3</Name>
     206      <Private>False</Private>
    199207    </ProjectReference>
    200208    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    201209      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    202210      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     211      <Private>False</Private>
    203212    </ProjectReference>
    204213    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    205214      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    206215      <Name>HeuristicLab.Optimization-3.3</Name>
     216      <Private>False</Private>
    207217    </ProjectReference>
    208218    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    209219      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    210220      <Name>HeuristicLab.Parameters-3.3</Name>
     221      <Private>False</Private>
    211222    </ProjectReference>
    212223    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    213224      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    214225      <Name>HeuristicLab.Persistence-3.3</Name>
     226      <Private>False</Private>
    215227    </ProjectReference>
    216228    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    217229      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    218230      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     231      <Private>False</Private>
    219232    </ProjectReference>
    220233    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    221234      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    222235      <Name>HeuristicLab.Random-3.3</Name>
     236      <Private>False</Private>
    223237    </ProjectReference>
    224238  </ItemGroup>
    … …  
    256270
    257271call PreBuildEvent.cmd
    258 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabEncodingsRealVectorEncodingPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabEncodingsRealVectorEncodingPlugin.cs"</PreBuildEvent>
     272</PreBuildEvent>
    259273  </PropertyGroup>
    260274</Project>
Note: See TracChangeset for help on using the changeset viewer.