Free cookie consent management tool by TermsFeed Policy Generator

Changeset 5426


Ignore:
Timestamp:
02/04/11 10:55:50 (14 years ago)
Author:
epitzer
Message:

Merged PSO into trunk (#852)

Location:
trunk/sources
Files:
6 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab 3.3.sln

    r5193 r5426  
    327327EndProject
    328328Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.ParallelEngine-3.3", "HeuristicLab.ParallelEngine\3.3\HeuristicLab.ParallelEngine-3.3.csproj", "{00814351-4AB8-4088-9B99-F62787B89E93}"
     329EndProject
     330Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3", "HeuristicLab.Algorithms.ParticleSwarmOptimization\3.3\HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj", "{2C429157-9C34-4DD3-9D5F-B444B751E39A}"
    329331EndProject
    330332Global
    … …  
    14811483    {00814351-4AB8-4088-9B99-F62787B89E93}.Release|x86.ActiveCfg = Release|x86
    14821484    {00814351-4AB8-4088-9B99-F62787B89E93}.Release|x86.Build.0 = Release|x86
     1485    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1486    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1487    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|x64.ActiveCfg = Debug|x64
     1488    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|x64.Build.0 = Debug|x64
     1489    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|x86.ActiveCfg = Debug|x86
     1490    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Debug|x86.Build.0 = Debug|x86
     1491    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1492    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|Any CPU.Build.0 = Release|Any CPU
     1493    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|x64.ActiveCfg = Release|x64
     1494    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|x64.Build.0 = Release|x64
     1495    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|x86.ActiveCfg = Release|x86
     1496    {2C429157-9C34-4DD3-9D5F-B444B751E39A}.Release|x86.Build.0 = Release|x86
    14831497  EndGlobalSection
    14841498  GlobalSection(SolutionProperties) = preSolution

  • trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj

    r5410 r5426  
    9292  </PropertyGroup>
    9393  <ItemGroup>
    94     <Reference Include="HeuristicLab.Encodings.IntegerVectorEncoding-3.3">
    95       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.dll</HintPath>
    96     </Reference>
    9794    <Reference Include="System" />
    9895    <Reference Include="System.Core">
    … …  
    137134  </ItemGroup>
    138135  <ItemGroup>
    139     <Reference Include="HeuristicLab.Analysis-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    140       <SpecificVersion>False</SpecificVersion>
    141       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Analysis-3.3.dll</HintPath>
    142     </Reference>
    143     <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    144       <SpecificVersion>False</SpecificVersion>
    145       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Collections-3.3.dll</HintPath>
    146     </Reference>
    147     <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    148       <SpecificVersion>False</SpecificVersion>
    149       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Common-3.3.dll</HintPath>
    150     </Reference>
    151     <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    152       <SpecificVersion>False</SpecificVersion>
    153       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Core-3.3.dll</HintPath>
    154     </Reference>
    155     <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    156       <SpecificVersion>False</SpecificVersion>
    157       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Data-3.3.dll</HintPath>
    158     </Reference>
    159     <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    160       <SpecificVersion>False</SpecificVersion>
    161       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
    162     </Reference>
    163     <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    164       <SpecificVersion>False</SpecificVersion>
    165       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Operators-3.3.dll</HintPath>
    166     </Reference>
    167     <Reference Include="HeuristicLab.Optimization-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    168       <SpecificVersion>False</SpecificVersion>
    169       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization-3.3.dll</HintPath>
    170     </Reference>
    171     <Reference Include="HeuristicLab.Optimization.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    172       <SpecificVersion>False</SpecificVersion>
    173       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Optimization.Operators-3.3.dll</HintPath>
    174     </Reference>
    175     <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    176       <SpecificVersion>False</SpecificVersion>
    177       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Parameters-3.3.dll</HintPath>
    178     </Reference>
    179     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    180       <SpecificVersion>False</SpecificVersion>
    181       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Persistence-3.3.dll</HintPath>
    182     </Reference>
    183     <Reference Include="HeuristicLab.PluginInfrastructure-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    184       <SpecificVersion>False</SpecificVersion>
    185       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
    186     </Reference>
    187     <Reference Include="HeuristicLab.Random-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86">
    188       <SpecificVersion>False</SpecificVersion>
    189       <HintPath>C:\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll</HintPath>
    190     </Reference>
    191   </ItemGroup>
    192   <ItemGroup>
    193136    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
    194137      <Visible>False</Visible>
    … …  
    206149      <Install>true</Install>
    207150    </BootstrapperPackage>
     151  </ItemGroup>
     152  <ItemGroup>
     153    <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
     154      <Project>{887425B4-4348-49ED-A457-B7D2C26DDBF9}</Project>
     155      <Name>HeuristicLab.Analysis-3.3</Name>
     156    </ProjectReference>
     157    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
     158      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
     159      <Name>HeuristicLab.Collections-3.3</Name>
     160    </ProjectReference>
     161    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
     162      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
     163      <Name>HeuristicLab.Common-3.3</Name>
     164    </ProjectReference>
     165    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
     166      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
     167      <Name>HeuristicLab.Core-3.3</Name>
     168    </ProjectReference>
     169    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
     170      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
     171      <Name>HeuristicLab.Data-3.3</Name>
     172    </ProjectReference>
     173    <ProjectReference Include="..\..\HeuristicLab.Encodings.IntegerVectorEncoding\3.3\HeuristicLab.Encodings.IntegerVectorEncoding-3.3.csproj">
     174      <Project>{DDFB14DD-2A85-493C-A52D-E69729BBAEB0}</Project>
     175      <Name>HeuristicLab.Encodings.IntegerVectorEncoding-3.3</Name>
     176    </ProjectReference>
     177    <ProjectReference Include="..\..\HeuristicLab.Encodings.RealVectorEncoding\3.3\HeuristicLab.Encodings.RealVectorEncoding-3.3.csproj">
     178      <Project>{BB6D334A-4BB6-4674-9883-31A6EBB32CAB}</Project>
     179      <Name>HeuristicLab.Encodings.RealVectorEncoding-3.3</Name>
     180    </ProjectReference>
     181    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
     182      <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project>
     183      <Name>HeuristicLab.Operators-3.3</Name>
     184    </ProjectReference>
     185    <ProjectReference Include="..\..\HeuristicLab.Optimization.Operators\3.3\HeuristicLab.Optimization.Operators-3.3.csproj">
     186      <Project>{25087811-F74C-4128-BC86-8324271DA13E}</Project>
     187      <Name>HeuristicLab.Optimization.Operators-3.3</Name>
     188    </ProjectReference>
     189    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
     190      <Project>{14AB8D24-25BC-400C-A846-4627AA945192}</Project>
     191      <Name>HeuristicLab.Optimization-3.3</Name>
     192    </ProjectReference>
     193    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
     194      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
     195      <Name>HeuristicLab.Parameters-3.3</Name>
     196    </ProjectReference>
     197    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     198      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
     199      <Name>HeuristicLab.Persistence-3.3</Name>
     200    </ProjectReference>
     201    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
     202      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
     203      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
     204    </ProjectReference>
     205    <ProjectReference Include="..\..\HeuristicLab.Random\3.3\HeuristicLab.Random-3.3.csproj">
     206      <Project>{F4539FB6-4708-40C9-BE64-0A1390AEA197}</Project>
     207      <Name>HeuristicLab.Random-3.3</Name>
     208    </ProjectReference>
    208209  </ItemGroup>
    209210  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    … …  
    226227  </PropertyGroup>
    227228  <PropertyGroup>
    228     <PostBuildEvent>copy $(TargetFileName) "C:\Program Files\HeuristicLab 3.3"</PostBuildEvent>
     229    <PostBuildEvent>
     230    </PostBuildEvent>
    229231  </PropertyGroup>
    230232</Project>

  • trunk/sources/HeuristicLab.Algorithms.ParticleSwarmOptimization/3.3/HeuristicLabAlgorithmsParticleSwarmOptimizationPlugin.cs.frame

    r5033 r5426  
    3434  [PluginDependency("HeuristicLab.Data", "3.3")]
    3535  [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
     36  [PluginDependency("HeuristicLab.Encodings.IntegerVectorEncoding", "3.3")]
    3637  [PluginDependency("HeuristicLab.Operators", "3.3")]
    3738  [PluginDependency("HeuristicLab.Optimization", "3.3")]

  • trunk/sources/HeuristicLab/3.3/Files.txt

    r5226 r5426  
    1111HeuristicLab.Algorithms.NSGA2\3.3:HeuristicLab.Algorithms.NSGA2-3.3.dll
    1212HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm\3.3:HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3.dll
     13HeuristicLab.Algorithms.ParticleSwarmOptimization\3.3:HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.dll
    1314HeuristicLab.Algorithms.SimulatedAnnealing\3.3:HeuristicLab.Algorithms.SimulatedAnnealing-3.3.dll
    1415HeuristicLab.Algorithms.TabuSearch\3.3:HeuristicLab.Algorithms.TabuSearch-3.3.dll

  • trunk/sources/HeuristicLab/3.3/Tests/Builder.testsettings

    r5226 r5426  
    9393    <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Problems.DataAnalysis.Classification.Views-3.3.dll" />
    9494    <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Optimization.Operators-3.3.dll" />
     95    <DeploymentItem filename="HeuristicLab\3.3\Tests\bin\Release\HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.dll" />
    9596  </Deployment>
    9697  <Execution>

  • trunk/sources/HeuristicLab/3.3/Tests/HeuristicLab-3.3.Tests.csproj

    r5193 r5426  
    159159      <Name>HeuristicLab.Algorithms.OffspringSelectionGeneticAlgorithm-3.3</Name>
    160160    </ProjectReference>
     161    <ProjectReference Include="..\..\..\HeuristicLab.Algorithms.ParticleSwarmOptimization\3.3\HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3.csproj">
     162      <Project>{2C429157-9C34-4DD3-9D5F-B444B751E39A}</Project>
     163      <Name>HeuristicLab.Algorithms.ParticleSwarmOptimization-3.3</Name>
     164    </ProjectReference>
    161165    <ProjectReference Include="..\..\..\HeuristicLab.Algorithms.SimulatedAnnealing\3.3\HeuristicLab.Algorithms.SimulatedAnnealing-3.3.csproj">
    162166      <Project>{96E5ED5B-187D-4012-9CDA-D85CDAD38342}</Project>
Note: See TracChangeset for help on using the changeset viewer.