Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
10/05/11 12:45:26 (12 years ago)
Author:
mkommend
Message:

#1653: Merged new HL solution into the trunk.

Location:
trunk/sources
Files:
3 edited

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.Algorithms.ParticleSwarmOptimization/3.3

    • Property svn:ignore
      •  

        old new  
        55*.suo
        66*.vs10x
         7Plugin.cs
  • trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj

    r5866 r6866  
    4040    <DebugType>full</DebugType>
    4141    <Optimize>false</Optimize>
    42     <OutputPath>bin\Debug\</OutputPath>
     42    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    4343    <DefineConstants>DEBUG;TRACE</DefineConstants>
    4444    <ErrorReport>prompt</ErrorReport>
     
    4949    <DebugType>pdbonly</DebugType>
    5050    <Optimize>true</Optimize>
    51     <OutputPath>bin\Release\</OutputPath>
     51    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    5252    <DefineConstants>TRACE</DefineConstants>
    5353    <ErrorReport>prompt</ErrorReport>
     
    5757  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
    5858    <DebugSymbols>true</DebugSymbols>
    59     <OutputPath>bin\x86\Debug\</OutputPath>
     59    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6060    <DefineConstants>DEBUG;TRACE</DefineConstants>
    6161    <DebugType>full</DebugType>
     
    6565  </PropertyGroup>
    6666  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
    67     <OutputPath>bin\x86\Release\</OutputPath>
     67    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    6868    <DefineConstants>TRACE</DefineConstants>
    6969    <Optimize>true</Optimize>
     
    7575  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
    7676    <DebugSymbols>true</DebugSymbols>
    77     <OutputPath>bin\x64\Debug\</OutputPath>
     77    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    7878    <DefineConstants>DEBUG;TRACE</DefineConstants>
    7979    <DebugType>full</DebugType>
     
    8383  </PropertyGroup>
    8484  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
    85     <OutputPath>bin\x64\Release\</OutputPath>
     85    <OutputPath>$(SolutionDir)\bin\</OutputPath>
    8686    <DefineConstants>TRACE</DefineConstants>
    8787    <Optimize>true</Optimize>
     
    108108    <Compile Include="MultiPSOTopologyUpdater.cs" />
    109109    <Compile Include="ParticleSwarmOptimizationMainLoop.cs" />
     110    <Compile Include="Plugin.cs" />
    110111    <Compile Include="RandomTopologyInitializer.cs" />
    111112    <Compile Include="VonNeumannTopologyInitializer.cs" />
    112113    <Compile Include="RingTopologyInitializer.cs" />
    113114    <Compile Include="TopologyInitializer.cs" />
    114     <Compile Include="HeuristicLabAlgorithmsParticleSwarmOptimizationPlugin.cs" />
    115115    <Compile Include="ParticleSwarmOptimization.cs" />
    116116    <Compile Include="Properties\AssemblyInfo.cs" />
     
    118118  <ItemGroup>
    119119    <None Include="HeuristicLab.snk" />
    120     <None Include="HeuristicLabAlgorithmsParticleSwarmOptimizationPlugin.cs.frame" />
    121     <None Include="Properties\AssemblyInfo.frame" />
     120    <None Include="Plugin.cs.frame" />
     121    <None Include="Properties\AssemblyInfo.cs.frame" />
    122122  </ItemGroup>
    123123  <ItemGroup>
     
    142142      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
    143143      <Name>HeuristicLab.Analysis-3.3</Name>
     144      <Private>False</Private>
    144145    </ProjectReference>
    145146    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
    146147      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
    147148      <Name>HeuristicLab.Collections-3.3</Name>
     149      <Private>False</Private>
    148150    </ProjectReference>
    149151    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
    150152      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
    151153      <Name>HeuristicLab.Common-3.3</Name>
     154      <Private>False</Private>
    152155    </ProjectReference>
    153156    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
    154157      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
    155158      <Name>HeuristicLab.Core-3.3</Name>
     159      <Private>False</Private>
    156160    </ProjectReference>
    157161    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
    158162      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
    159163      <Name>HeuristicLab.Data-3.3</Name>
     164      <Private>False</Private>
    160165    </ProjectReference>
    161166    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
    162167      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
    163168      <Name>HeuristicLab.Operators-3.3</Name>
     169      <Private>False</Private>
    164170    </ProjectReference>
    165171    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
    166172      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
    167173      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     174      <Private>False</Private>
    168175    </ProjectReference>
    169176    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
    170177      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
    171178      <Name>HeuristicLab.Optimization-3.3</Name>
     179      <Private>False</Private>
    172180    </ProjectReference>
    173181    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
    174182      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
    175183      <Name>HeuristicLab.Parameters-3.3</Name>
     184      <Private>False</Private>
    176185    </ProjectReference>
    177186    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
    178187      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
    179188      <Name>HeuristicLab.Persistence-3.3</Name>
     189      <Private>False</Private>
    180190    </ProjectReference>
    181191    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
    182192      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
    183193      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     194      <Private>False</Private>
    184195    </ProjectReference>
    185196    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
    186197      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
    187198      <Name>HeuristicLab.Random-3.3</Name>
     199      <Private>False</Private>
    188200    </ProjectReference>
    189201  </ItemGroup>
     
    202214set Outdir=$(Outdir)
    203215
    204 call PreBuildEvent.cmd
    205 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\HeuristicLabAlgorithmsParticleSwarmOptimizationPlugin.cs.frame" "%25ProjectDir%25\HeuristicLabAlgorithmsParticleSwarmOptimizationPlugin.cs"
    206 SubWCRev "%25ProjectDir%25\" "%25ProjectDir%25\Properties\AssemblyInfo.frame" "%25ProjectDir%25\Properties\AssemblyInfo.cs"</PreBuildEvent>
     216call PreBuildEvent.cmd</PreBuildEvent>
    207217  </PropertyGroup>
    208218  <PropertyGroup>
Note: See TracChangeset for help on using the changeset viewer.