Free cookie consent management tool by TermsFeed Policy Generator

Changeset 7873


Ignore:
Timestamp:
05/23/12 10:09:48 (12 years ago)
Author:
abeham
Message:

#1855:

  • Added linear assignment problem (LAP)
  • Added solver (+unit test)
  • Added dependencies in HeuristicLab-3.3 project
Location:
trunk/sources
Files:
20 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab 3.3.sln

    r7849 r7873  
    5858    {DF87C13E-A889-46FF-8153-66DCAA8C5674} = {DF87C13E-A889-46FF-8153-66DCAA8C5674}
    5959    {3D28463F-EC96-4D82-AFEE-38BE91A0CA00} = {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}
     60    {7250653F-DE83-4069-8D34-8050E8E45EA1} = {7250653F-DE83-4069-8D34-8050E8E45EA1}
    6061    {F98A1740-9AC9-4D36-A582-6A2D0D06978D} = {F98A1740-9AC9-4D36-A582-6A2D0D06978D}
    6162    {73F29D43-5714-4069-8FAB-0D18FEB5F175} = {73F29D43-5714-4069-8FAB-0D18FEB5F175}
     
    6566    {C49CB749-8B24-4628-8003-E86475749410} = {C49CB749-8B24-4628-8003-E86475749410}
    6667    {BB6D334A-4BB6-4674-9883-31A6EBB32CAB} = {BB6D334A-4BB6-4674-9883-31A6EBB32CAB}
     68    {8A7C524C-4B72-45FD-8274-EFB67C27C169} = {8A7C524C-4B72-45FD-8274-EFB67C27C169}
     69    {94C7714E-29D4-4D6D-B213-2C18D627AB75} = {94C7714E-29D4-4D6D-B213-2C18D627AB75}
    6770    {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B} = {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B}
    6871    {2C36CD4F-E5F5-43A4-801A-201EA895FE17} = {2C36CD4F-E5F5-43A4-801A-201EA895FE17}
     
    8992    {997F018D-AEA2-4F21-9301-82FAF6A5612D} = {997F018D-AEA2-4F21-9301-82FAF6A5612D}
    9093    {D767C38D-8014-46B0-9A32-03A3AECCE34A} = {D767C38D-8014-46B0-9A32-03A3AECCE34A}
     94    {B1BA398F-953F-4C3A-B07B-1E5E17A27DD9} = {B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}
    9195    {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58} = {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}
    9296    {3540E29E-4793-49E7-8EE2-FEA7F61C3994} = {3540E29E-4793-49E7-8EE2-FEA7F61C3994}
     
    297301EndProject
    298302Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.Instances.DataAnalysis-3.3", "HeuristicLab.Problems.Instances.DataAnalysis\3.3\HeuristicLab.Problems.Instances.DataAnalysis-3.3.csproj", "{94C7714E-29D4-4D6D-B213-2C18D627AB75}"
     303EndProject
     304Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.LinearAssignment-3.3", "HeuristicLab.Problems.LinearAssignment\3.3\HeuristicLab.Problems.LinearAssignment-3.3.csproj", "{7250653F-DE83-4069-8D34-8050E8E45EA1}"
     305EndProject
     306Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.LinearAssignment.Views-3.3", "HeuristicLab.Problems.LinearAssignment.Views\3.3\HeuristicLab.Problems.LinearAssignment.Views-3.3.csproj", "{8A7C524C-4B72-45FD-8274-EFB67C27C169}"
    299307EndProject
    300308Global
     
    14551463    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|x64.ActiveCfg = Release|Any CPU
    14561464    {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|x86.ActiveCfg = Release|Any CPU
     1465    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1466    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1467    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Debug|x64.ActiveCfg = Debug|x64
     1468    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Debug|x64.Build.0 = Debug|x64
     1469    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Debug|x86.ActiveCfg = Debug|x86
     1470    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Debug|x86.Build.0 = Debug|x86
     1471    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1472    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Release|Any CPU.Build.0 = Release|Any CPU
     1473    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Release|x64.ActiveCfg = Release|x64
     1474    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Release|x64.Build.0 = Release|x64
     1475    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Release|x86.ActiveCfg = Release|x86
     1476    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Release|x86.Build.0 = Release|x86
     1477    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1478    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1479    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Debug|x64.ActiveCfg = Debug|x64
     1480    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Debug|x64.Build.0 = Debug|x64
     1481    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Debug|x86.ActiveCfg = Debug|x86
     1482    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Debug|x86.Build.0 = Debug|x86
     1483    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1484    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Release|Any CPU.Build.0 = Release|Any CPU
     1485    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Release|x64.ActiveCfg = Release|x64
     1486    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Release|x64.Build.0 = Release|x64
     1487    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Release|x86.ActiveCfg = Release|x86
     1488    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Release|x86.Build.0 = Release|x86
    14571489  EndGlobalSection
    14581490  GlobalSection(SolutionProperties) = preSolution
  • trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

    r7870 r7873  
    172172      <RequiredTargetFramework>3.5</RequiredTargetFramework>
    173173    </Reference>
     174    <Reference Include="System.Data" />
    174175    <Reference Include="System.Drawing" />
    175176    <Reference Include="System.Runtime.Serialization" />
     177    <Reference Include="System.ServiceModel" />
     178    <Reference Include="System.Xml" />
    176179    <Reference Include="WeifenLuo.WinFormsUI.Docking-2.3.1, Version=2.3.1.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
    177180      <HintPath>..\bin\WeifenLuo.WinFormsUI.Docking-2.3.1.dll</HintPath>
     
    291294    <Compile Include="HeuristicLab.Problems.TestFunctions-3.3\ZakharovEvaluatorTest.cs" />
    292295    <Compile Include="HeuristicLab.Problems.TravelingSalesman-3.3\TSPMoveEvaluatorTest.cs" />
     296    <Compile Include="HeuristicLab.Problems.LinearAssignment-3.3\LinearAssignmentProblemSolverTest.cs" />
    293297    <Compile Include="Properties\AssemblyInfo.cs" />
    294298    <Compile Include="TestRandom.cs" />
     
    637641      <Name>HeuristicLab.Problems.Knapsack-3.3</Name>
    638642    </ProjectReference>
     643    <ProjectReference Include="..\HeuristicLab.Problems.LinearAssignment\3.3\HeuristicLab.Problems.LinearAssignment-3.3.csproj">
     644      <Project>{7250653F-DE83-4069-8D34-8050E8E45EA1}</Project>
     645      <Name>HeuristicLab.Problems.LinearAssignment-3.3</Name>
     646    </ProjectReference>
    639647    <ProjectReference Include="..\HeuristicLab.Problems.OneMax.Views\3.3\HeuristicLab.Problems.OneMax.Views-3.3.csproj">
    640648      <Project>{4FE983A1-AAF8-4977-B9E2-52B3224510CB}</Project>
Note: See TracChangeset for help on using the changeset viewer.