Changeset 7873 for trunk/sources

Timestamp:

05/23/12 10:09:48 (13 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:

• HeuristicLab 3.3.sln (modified) (5 diffs)
• HeuristicLab.Problems.LinearAssignment (added)
• HeuristicLab.Problems.LinearAssignment.Views (added)
• HeuristicLab.Problems.LinearAssignment.Views/3.3 (added)
• HeuristicLab.Problems.LinearAssignment.Views/3.3/HeuristicLab.Problems.LinearAssignment.Views-3.3.csproj (added)
• HeuristicLab.Problems.LinearAssignment.Views/3.3/HeuristicLab.snk (added)
• HeuristicLab.Problems.LinearAssignment.Views/3.3/LinearAssignmentProblemView.Designer.cs (added)
• HeuristicLab.Problems.LinearAssignment.Views/3.3/LinearAssignmentProblemView.cs (added)
• HeuristicLab.Problems.LinearAssignment.Views/3.3/Plugin.cs.frame (added)
• HeuristicLab.Problems.LinearAssignment.Views/3.3/Properties (added)
• HeuristicLab.Problems.LinearAssignment.Views/3.3/Properties/AssemblyInfo.frame (added)
• HeuristicLab.Problems.LinearAssignment/3.3 (added)
• HeuristicLab.Problems.LinearAssignment/3.3/HeuristicLab.Problems.LinearAssignment-3.3.csproj (added)
• HeuristicLab.Problems.LinearAssignment/3.3/HeuristicLab.snk (added)
• HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblem.cs (added)
• HeuristicLab.Problems.LinearAssignment/3.3/LinearAssignmentProblemSolver.cs (added)
• HeuristicLab.Problems.LinearAssignment/3.3/Plugin.cs.frame (added)
• HeuristicLab.Problems.LinearAssignment/3.3/Properties (added)
• HeuristicLab.Problems.LinearAssignment/3.3/Properties/AssemblyInfo.frame (added)
• HeuristicLab.Tests/HeuristicLab.Problems.LinearAssignment-3.3 (added)
• HeuristicLab.Tests/HeuristicLab.Problems.LinearAssignment-3.3/LinearAssignmentProblemSolverTest.cs (added)
• HeuristicLab.Tests/HeuristicLab.Tests.csproj (modified) (3 diffs)

trunk/sources/HeuristicLab 3.3.sln

@@ -58 +58 @@
     {DF87C13E-A889-46FF-8153-66DCAA8C5674} = {DF87C13E-A889-46FF-8153-66DCAA8C5674}
     {3D28463F-EC96-4D82-AFEE-38BE91A0CA00} = {3D28463F-EC96-4D82-AFEE-38BE91A0CA00}
+    {7250653F-DE83-4069-8D34-8050E8E45EA1} = {7250653F-DE83-4069-8D34-8050E8E45EA1}
     {F98A1740-9AC9-4D36-A582-6A2D0D06978D} = {F98A1740-9AC9-4D36-A582-6A2D0D06978D}
     {73F29D43-5714-4069-8FAB-0D18FEB5F175} = {73F29D43-5714-4069-8FAB-0D18FEB5F175}
@@ -65 +66 @@
     {C49CB749-8B24-4628-8003-E86475749410} = {C49CB749-8B24-4628-8003-E86475749410}
     {BB6D334A-4BB6-4674-9883-31A6EBB32CAB} = {BB6D334A-4BB6-4674-9883-31A6EBB32CAB}
+    {8A7C524C-4B72-45FD-8274-EFB67C27C169} = {8A7C524C-4B72-45FD-8274-EFB67C27C169}
+    {94C7714E-29D4-4D6D-B213-2C18D627AB75} = {94C7714E-29D4-4D6D-B213-2C18D627AB75}
     {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B} = {A51DA44F-CB35-4F6F-99F5-2A2E904AB93B}
     {2C36CD4F-E5F5-43A4-801A-201EA895FE17} = {2C36CD4F-E5F5-43A4-801A-201EA895FE17}
@@ -89 +92 @@
     {997F018D-AEA2-4F21-9301-82FAF6A5612D} = {997F018D-AEA2-4F21-9301-82FAF6A5612D}
     {D767C38D-8014-46B0-9A32-03A3AECCE34A} = {D767C38D-8014-46B0-9A32-03A3AECCE34A}
+    {B1BA398F-953F-4C3A-B07B-1E5E17A27DD9} = {B1BA398F-953F-4C3A-B07B-1E5E17A27DD9}
     {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58} = {F409DD9E-1E9C-4EB1-AA3A-9F6E987C6E58}
     {3540E29E-4793-49E7-8EE2-FEA7F61C3994} = {3540E29E-4793-49E7-8EE2-FEA7F61C3994}
@@ -297 +301 @@
 EndProject
 Project("{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}"
+EndProject
+Project("{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}"
+EndProject
+Project("{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}"
 EndProject
 Global
@@ -1455 +1463 @@
     {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|x64.ActiveCfg = Release|Any CPU
     {94C7714E-29D4-4D6D-B213-2C18D627AB75}.Release|x86.ActiveCfg = Release|Any CPU
+    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Debug|x64.ActiveCfg = Debug|x64
+    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Debug|x64.Build.0 = Debug|x64
+    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Debug|x86.ActiveCfg = Debug|x86
+    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Debug|x86.Build.0 = Debug|x86
+    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Release|Any CPU.Build.0 = Release|Any CPU
+    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Release|x64.ActiveCfg = Release|x64
+    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Release|x64.Build.0 = Release|x64
+    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Release|x86.ActiveCfg = Release|x86
+    {7250653F-DE83-4069-8D34-8050E8E45EA1}.Release|x86.Build.0 = Release|x86
+    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Debug|x64.ActiveCfg = Debug|x64
+    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Debug|x64.Build.0 = Debug|x64
+    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Debug|x86.ActiveCfg = Debug|x86
+    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Debug|x86.Build.0 = Debug|x86
+    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Release|Any CPU.Build.0 = Release|Any CPU
+    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Release|x64.ActiveCfg = Release|x64
+    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Release|x64.Build.0 = Release|x64
+    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Release|x86.ActiveCfg = Release|x86
+    {8A7C524C-4B72-45FD-8274-EFB67C27C169}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution

trunk/sources/HeuristicLab.Tests/HeuristicLab.Tests.csproj

@@ -172 +172 @@
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Xml" />
     <Reference Include="WeifenLuo.WinFormsUI.Docking-2.3.1, Version=2.3.1.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <HintPath>..\bin\WeifenLuo.WinFormsUI.Docking-2.3.1.dll</HintPath>
@@ -291 +294 @@
     <Compile Include="HeuristicLab.Problems.TestFunctions-3.3\ZakharovEvaluatorTest.cs" />
     <Compile Include="HeuristicLab.Problems.TravelingSalesman-3.3\TSPMoveEvaluatorTest.cs" />
+    <Compile Include="HeuristicLab.Problems.LinearAssignment-3.3\LinearAssignmentProblemSolverTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TestRandom.cs" />
@@ -637 +641 @@
       <Name>HeuristicLab.Problems.Knapsack-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Problems.LinearAssignment\3.3\HeuristicLab.Problems.LinearAssignment-3.3.csproj">
+      <Project>{7250653F-DE83-4069-8D34-8050E8E45EA1}</Project>
+      <Name>HeuristicLab.Problems.LinearAssignment-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Problems.OneMax.Views\3.3\HeuristicLab.Problems.OneMax.Views-3.3.csproj">
       <Project>{4FE983A1-AAF8-4977-B9E2-52B3224510CB}</Project>