Changeset 15490 for branches/GeneralizedQAP

Timestamp:

12/04/17 23:00:03 (7 years ago)

Author:

abeham

Message:

#1614:

• branched optimization
• adapted references
• renamed plugin

Location:

branches/GeneralizedQAP

Files:

• . (modified) (1 prop)
• GeneralizedQAP.sln (modified) (4 diffs)
• GeneralizedQAP.vsmdi (deleted)
• HeuristicLab.Algorithms.GRASP (moved) (moved from branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms)
• HeuristicLab.Algorithms.GRASP/3.3/GRASPWithPathRelinking.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.GRASP/3.3/GRASPWithPathRelinkingMainLoop.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.GRASP/3.3/HeuristicLab.Algorithms.GRASP-3.3.csproj (added)
• HeuristicLab.Algorithms.GRASP/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.3.3.csproj (deleted)
• HeuristicLab.Algorithms.GRASP/3.3/Plugin.cs.frame (modified) (3 diffs)
• HeuristicLab.Algorithms.GRASP/3.3/Properties/AssemblyInfo.cs.frame (modified) (3 diffs)
• HeuristicLab.Optimization (copied) (copied from trunk/sources/HeuristicLab.Optimization)
• HeuristicLab.Optimization/3.3/BasicProblems/BasicProblem.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs (modified) (1 diff)
• HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj (modified) (7 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common/3.3 (modified) (1 prop)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common/3.3/IntegerVectorEqualityComparer.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.csproj (modified) (3 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/GQAPPopulationDiversityAnalyzer.cs (modified) (2 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj.user (modified) (1 diff)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/CordeauCrossover.cs (modified) (8 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/GQAPPathRelinking.cs (modified) (6 diffs)
• HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/PopulationReducers/GQAPQualitySimilarityReducer.cs (modified) (1 diff)
• Local.testsettings (deleted)
• TraceAndTestImpact.testsettings (deleted)
• UnitTests/CordeauCrossoverTest.cs (modified) (3 diffs)
• UnitTests/UnitTests.csproj (modified) (2 diffs)

branches/GeneralizedQAP

@@ -2 +2 @@
 TestResults
 *.user
+.vs

@@ -2 +2 @@
 TestResults
 *.user
+.vs

branches/GeneralizedQAP/GeneralizedQAP.sln

@@ -1 +1 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio 15
+VisualStudioVersion = 15.0.27004.2002
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3", "HeuristicLab.Problems.GeneralizedQuadraticAssignment\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj", "{C739E6D2-5680-4804-A810-8017DA0C238F}"
@@ -8 +8 @@
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3", "HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.csproj", "{BFAAC00C-B884-458D-BD74-98C94BFAFA41}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.3.3", "HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms.3.3.csproj", "{53AB48BF-532F-417D-B98B-745105BB447A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Algorithms.GRASP-3.3", "HeuristicLab.Algorithms.GRASP\3.3\HeuristicLab.Algorithms.GRASP-3.3.csproj", "{53AB48BF-532F-417D-B98B-745105BB447A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3", "HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3.csproj", "{DA367BE5-4F53-4243-933B-32AAB86189D5}"
@@ -15 +15 @@
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7275B9B0-0E8D-471E-9F64-067E1F85BB71}"
-  ProjectSection(SolutionItems) = preProject
-    GeneralizedQAP.vsmdi = GeneralizedQAP.vsmdi
-    Local.testsettings = Local.testsettings
-    TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
-  EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Optimization-3.3", "HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj", "{14AB8D24-25BC-400C-A846-4627AA945192}"
 EndProject
 Global
@@ -91 +88 @@
     {68C6C157-08DA-414F-9256-CCCA13038399}.Release|x86.ActiveCfg = Release|Any CPU
     {68C6C157-08DA-414F-9256-CCCA13038399}.Release|x86.Build.0 = Release|Any CPU
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x64.ActiveCfg = Debug|x64
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x64.Build.0 = Debug|x64
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x86.ActiveCfg = Debug|x86
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Debug|x86.Build.0 = Debug|x86
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|Any CPU.Build.0 = Release|Any CPU
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x64.ActiveCfg = Release|x64
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x64.Build.0 = Release|x64
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x86.ActiveCfg = Release|x86
+    {14AB8D24-25BC-400C-A846-4627AA945192}.Release|x86.Build.0 = Release|x86
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution
     HideSolutionNode = FALSE
   EndGlobalSection
-  GlobalSection(TestCaseManagementSettings) = postSolution
-    CategoryFile = GeneralizedQAP.vsmdi
+  GlobalSection(ExtensibilityGlobals) = postSolution
+    SolutionGuid = {B0BBF50B-4E62-4BAB-A730-881208150933}
   EndGlobalSection
 EndGlobal

branches/GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3/GRASPWithPathRelinking.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -34 +34 @@
 using HeuristicLab.Random;
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
+namespace HeuristicLab.Algorithms.GRASP {
   /// <summary>
   /// The algorithm combines the Greedy Randomized Adaptive Search Procedure (GRASP) with Path Relinking and is described in Mateus, G., Resende, M., and Silva, R. 2011. GRASP with path-relinking for the generalized quadratic assignment problem. Journal of Heuristics 17, Springer Netherlands, pp. 527-565.

branches/GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3/GRASPWithPathRelinkingMainLoop.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -33 +33 @@
 using HeuristicLab.Selection;
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
+namespace HeuristicLab.Algorithms.GRASP {
   [Item("GRASP+PR MainLoop", "The main loop that implements the behavior of the GRASP+PR algorithm.")]
   [StorableClass]

branches/GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3/Plugin.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2015 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -22 +22 @@
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms {
-  [Plugin("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms", "3.3.13.$WCREV$")]
-  [PluginFile("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms-3.3.dll", PluginFileType.Assembly)]
+namespace HeuristicLab.Algorithms.GRASP {
+  [Plugin("HeuristicLab.Algorithms.GRASP", "3.3.14.$WCREV$")]
+  [PluginFile("HeuristicLab.Algorithms.GRASP-3.3.dll", PluginFileType.Assembly)]
   [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
@@ -38 +38 @@
   [PluginDependency("HeuristicLab.Random", "3.3")]
   [PluginDependency("HeuristicLab.Selection", "3.3")]
-  public class HeuristicLabProblemsGeneralizedQuadraticAssignmentAlgorithmsPlugin : PluginBase {
+  public class HeuristicLabAlgorithmsGRASPPlugin : PluginBase {
   }
 }

branches/GeneralizedQAP/HeuristicLab.Algorithms.GRASP/3.3/Properties/AssemblyInfo.cs.frame

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2012 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2017 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -27 +27 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("HeuristicLab.Problems.GeneralizedQuadraticAssignment.Algorithms")]
+[assembly: AssemblyTitle("HeuristicLab.Algorithms.GRASP")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("HEAL")]
 [assembly: AssemblyProduct("HeuristicLab")]
-[assembly: AssemblyCopyright("(c) 2002-2012 HEAL")]
+[assembly: AssemblyCopyright("(c) 2002-2017 HEAL")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -55 +55 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.3.0.0")]
-[assembly: AssemblyFileVersion("3.3.6.$WCREV$")]
+[assembly: AssemblyFileVersion("3.3.14.$WCREV$")]

branches/GeneralizedQAP/HeuristicLab.Optimization/3.3/BasicProblems/BasicProblem.cs

@@ -65 +65 @@
     protected BasicProblem()
       : base() {
-      Parameters.Add(new ValueParameter<TEncoding>("Encoding", "Describes the configuration of the encoding, what the variables are called, what type they are and their bounds if any."));
+      var encodingParameter = new ValueParameter<TEncoding>("Encoding", "Describes the configuration of the encoding, what the variables are called, what type they are and their bounds if any.");
+      // ABE: disable showing the encoding itself in the run by default as it wastes a lot of space
+      //      note that parameters of the encoding might still show up in the run
+      encodingParameter.GetsCollected = false;
+      Parameters.Add(encodingParameter);
       oldEncoding = Encoding;
       if(Encoding != null) Parameterize();

branches/GeneralizedQAP/HeuristicLab.Optimization/3.3/BasicProblems/Encoding.cs

@@ -92 +92 @@
     protected Encoding(string name)
       : base(name) {
-      Parameters.Add(new FixedValueParameter<ReadOnlyItemSet<IOperator>>(name + ".Operators", "The operators that the encoding specifies.", encodingOperators.AsReadOnly()));
+      var operatorsParam = new FixedValueParameter<ReadOnlyItemSet<IOperator>>(name + ".Operators", "The operators that the encoding specifies.", encodingOperators.AsReadOnly());
+      // ABE: disable showing the operator collection in the run by default as it wastes a lot of space
+      operatorsParam.GetsCollected = false;
+      Parameters.Add(operatorsParam);
     }
 

branches/GeneralizedQAP/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -41 +41 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -51 +51 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
@@ -62 +62 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -71 +71 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
@@ -84 +84 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DebugSymbols>true</DebugSymbols>
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
@@ -93 +93 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>$(SolutionDir)\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <DocumentationFile>
@@ -267 +267 @@
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj">
-      <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project>
-      <Name>HeuristicLab.Collections-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj">
-      <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project>
-      <Name>HeuristicLab.Common.Resources-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj">
-      <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project>
-      <Name>HeuristicLab.Common-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Core\3.3\HeuristicLab.Core-3.3.csproj">
-      <Project>{C36BD924-A541-4A00-AFA8-41701378DDC5}</Project>
-      <Name>HeuristicLab.Core-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Data\3.3\HeuristicLab.Data-3.3.csproj">
-      <Project>{BBAB9DF5-5EF3-4BA8-ADE9-B36E82114937}</Project>
-      <Name>HeuristicLab.Data-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">
-      <Project>{23da7ff4-d5b8-41b6-aa96-f0561d24f3ee}</Project>
-      <Name>HeuristicLab.Operators-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Parameters\3.3\HeuristicLab.Parameters-3.3.csproj">
-      <Project>{56F9106A-079F-4C61-92F6-86A84C2D84B7}</Project>
-      <Name>HeuristicLab.Parameters-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
-      <Project>{102BC7D3-0EF9-439C-8F6D-96FF0FDB8E1B}</Project>
-      <Name>HeuristicLab.Persistence-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\3.3\HeuristicLab.PluginInfrastructure-3.3.csproj">
-      <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
-      <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
-      <Private>False</Private>
-    </ProjectReference>
+    <Reference Include="HeuristicLab.Collections-3.3, Version=3.3.0.0">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Collections-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common.Resources-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Common-3.3, Version=3.3.0.0">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Common-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Core-3.3, Version=3.3.0.0">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Core-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Data-3.3, Version=3.3.0.0">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Data-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Persistence-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="HeuristicLab.PluginInfrastructure-3.3">
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.PluginInfrastructure-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common/3.3

@@ -1 +1 @@
 obj
 Plugin.cs
+*.user

@@ -1 +1 @@
 obj
 Plugin.cs
+*.user

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3.csproj

@@ -69 +69 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Optimization-3.3">
-      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="HeuristicLab.Parameters-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
@@ -102 +98 @@
     <None Include="HeuristicLab.snk" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common/3.3/IntegerVectorEqualityComparer.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
-using HeuristicLab.Encodings.IntegerVectorEncoding;
 
-namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common {
-  public class IntegerVectorEqualityComparer : EqualityComparer<IntegerVector> {
-    public override bool Equals(IntegerVector x, IntegerVector y) {
-      if (x == null || y == null) return false;
-      if (x.Length != y.Length) return false;
-
-      for (int i = 0; i < x.Length; i++)
-        if (x[i] != y[i]) return false;
-
-      return true;
-    }
-
-    public override int GetHashCode(IntegerVector obj) {
-      return obj.GetHashCode();
-    }
-
-    public static double GetSimilarity(IntegerVector a, IntegerVector b) {
-      int similar = 0;
-      for (int i = 0; i < a.Length; i++) {
-        if (a[i] == b[i]) similar++;
-      }
-      return similar / (double)a.Length;
-    }
-
-    public static double GetDistance(IntegerVector a, IntegerVector b) {
-      return 1.0 - GetSimilarity(a, b);
-    }
-
-    public static IEnumerable<int> GetDifferingIndices(IntegerVector a, IntegerVector b) {
+namespace HeuristicLab.Encodings.IntegerVectorEncoding {
+  public static class IntegerVectorExtensions {
+    public static IEnumerable<int> GetDifferingIndices(this IntegerVector a, IntegerVector b) {
+      if (b == null) throw new ArgumentNullException("b");
       for (int i = 0; i < a.Length; i++)
         if (a[i] != b[i]) yield return i;

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment.Views-3.3.csproj

@@ -83 +83 @@
       <Private>False</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Optimization-3.3">
-      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="HeuristicLab.Parameters-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
@@ -113 +109 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="GQAPAssignmentArchiveView.cs" />
+    <Compile Include="GQAPAssignmentArchiveView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="GQAPAssignmentArchiveView.Designer.cs">
       <DependentUpon>GQAPAssignmentArchiveView.cs</DependentUpon>
     </Compile>
-    <Compile Include="GQAPAssignmentView.cs" />
+    <Compile Include="GQAPAssignmentView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="GQAPAssignmentView.Designer.cs">
       <DependentUpon>GQAPAssignmentView.cs</DependentUpon>
@@ -130 +130 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.GeneralizedQuadraticAssignment\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj">
       <Project>{C739E6D2-5680-4804-A810-8017DA0C238F}</Project>

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/GQAPPopulationDiversityAnalyzer.cs

@@ -27 +27 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment.Analyzers {
@@ -71 +70 @@
       for (int i = 0; i < solutions.Length - 1; i++)
         for (int j = i + 1; j < solutions.Length; j++) {
-          result[i, j] = IntegerVectorEqualityComparer.GetSimilarity(solutions[i], solutions[j]);
+          result[i, j] = HammingSimilarityCalculator.CalculateSimilarity(solutions[i], solutions[j]);
           result[j, i] = result[i, j];
         }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/GeneralizedQuadraticAssignmentProblem.cs

@@ -35 +35 @@
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
-  [Item("Generalized Quadratic Assignment Problem", "The Generalized Quadratic Assignment Problem (GQAP) is a generalization of the QAP in that it allows to assign multiple facilities (here called equipment) to a single location. The problem is described in Lee, C.G., and Ma, Z. 2003. The Generalized Quadratic Assignment Problem. Technical Report M5S 3G8, University of Toronto, Canada.")]
+  [Item("Generalized Quadratic Assignment Problem (GQAP)", "The Generalized Quadratic Assignment Problem (GQAP) is a generalization of the QAP in that it allows to assign multiple facilities (here called equipment) to a single location. The problem is described in Lee, C.G., and Ma, Z. 2003. The Generalized Quadratic Assignment Problem. Technical Report M5S 3G8, University of Toronto, Canada.")]
   [Creatable("Problems")]
   [StorableClass]

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj

@@ -71 +71 @@
     <Reference Include="HeuristicLab.Operators-3.3">
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Operators-3.3.dll</HintPath>
-      <Private>False</Private>
-    </Reference>
-    <Reference Include="HeuristicLab.Optimization-3.3">
-      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
       <Private>False</Private>
     </Reference>
@@ -184 +180 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3.csproj">
       <Project>{DA367BE5-4F53-4243-933B-32AAB86189D5}</Project>

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/HeuristicLab.Problems.GeneralizedQuadraticAssignment-3.3.csproj.user

@@ -3 +3 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <StartAction>Program</StartAction>
-    <StartProgram>C:\Users\P40311\Work\HL3\trunk\sources\bin\HeuristicLab 3.3.exe</StartProgram>
+    <StartProgram>C:\Users\P40311\Work\core\trunk\sources\bin\HeuristicLab 3.3.exe</StartProgram>
     <StartArguments>/hideStarter /start:Optimizer</StartArguments>
   </PropertyGroup>

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/CordeauCrossover.cs

@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -27 +28 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.GeneralizedQuadraticAssignment {
@@ -74 +76 @@
     public IValueLookupParameter<IGQAPEvaluator> EvaluatorParameter {
       get { return (IValueLookupParameter<IGQAPEvaluator>)Parameters["Evaluator"]; }
+    }
+    public ILookupParameter<IntValue> EvaluatedSolutionsParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["EvaluatedSolutions"]; }
     }
 
@@ -96 +101 @@
       Parameters.Add(new ValueLookupParameter<DoubleValue>("ExpectedRandomQuality", GeneralizedQuadraticAssignmentProblem.ExpectedRandomQualityDescription));
       Parameters.Add(new ValueLookupParameter<IGQAPEvaluator>("Evaluator", "The evaluator used to evaluate solutions."));
+      Parameters.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The number of evaluated solutions."));
     }
 
@@ -107 +113 @@
       DoubleMatrix weights, DoubleMatrix distances, DoubleMatrix installationCosts,
       DoubleArray demands, DoubleArray capacities,
-      double transportationCosts, double expectedRandomQuality, IGQAPEvaluator evaluator) {
-      var mediana = Inizialize(distances);
+      double transportationCosts, double expectedRandomQuality, IGQAPEvaluator evaluator, IntValue evaluatedSolutions) {
+      var medianDistances = Enumerable.Range(0, distances.Rows).Select(x => distances.GetRow(x).Median()).ToArray();
+
       int m = capacities.Length;
       int n = demands.Length;
-      int i, j, k, ik1, ik2;
-      int control;
-      bool nofound = false, onefound = false;
-      double fbest;
-      IntegerVector son = new IntegerVector(parent1.Length), result = null;
+      
+      bool onefound = false;
+      double fbest, fbestAttempt = maximization.Value ? double.MinValue : double.MaxValue;
+      IntegerVector bestAttempt = null;
+      IntegerVector result = null;
 
       fbest = quality1.Value;
@@ -126 +133 @@
       }
       var cap = new double[m];
-      for (i = 0; i < m; i++) {
-
-        for (j = 0; j < m; j++) cap[j] = 0;
-
-        for (k = 0; k < n; k++) {
-          son[k] = -1;
-          ik1 = parent1[k];
-          ik2 = parent2[k];
-          if (distances[i, ik1] < mediana[i]) {
-            son[k] = ik1;
-            cap[ik1] += demands[k];
-          } else if (distances[i, ik2] > mediana[i]) {
-            son[k] = ik2;
-            cap[ik2] += demands[k];
-          }
-        }
-        k = 0;
-        nofound = false;
-        while (k < n && !nofound) {
-          if (son[k] < 0) {
-            control = 0;
-            do {
-              j = random.Next(m);
-              control++;
-            }
-            while (cap[j] + demands[k] > capacities[j] && control < 3 * m);
-            if (cap[j] + demands[k] <= capacities[j]) {
-              son[k] = j;
-              cap[j] += demands[k];
-            } else {
-              nofound = true;
-            }
-          }
-          k++;
-        }
-        if (!nofound) {
-          double sonQual = evaluator.Evaluate(son, weights, distances, installationCosts, demands, capacities, transportationCosts, expectedRandomQuality);
-          if (sonQual < fbest) {
-            fbest = sonQual;
-            result = (IntegerVector)son.Clone();
+      for (var i = 0; i < m; i++) {
+        int unassigned;
+        Array.Clear(cap, 0, m);
+        var child = Merge(parent1, parent2, distances, demands, medianDistances, m, n, i, cap, out unassigned);
+        if (unassigned > 0)
+          TryRandomAssignment(random, demands, capacities, m, n, cap, child, ref unassigned);
+        if (unassigned == 0) {
+          var childFit = evaluator.Evaluate(child, weights, distances, installationCosts, demands, capacities, transportationCosts, expectedRandomQuality);
+          evaluatedSolutions.Value++;
+          if (maximization.Value && childFit >= fbest
+            || !maximization.Value && childFit <= fbest) {
+            fbest = childFit;
+            result = child;
             onefound = true;
           }
-        }/* else {
-          abortedmerge++;
-          printf("aborted merge %8d\n", abortedmerge);
-        } */
-      }
-      if (!onefound && !nofound) {
-        i = random.Next(m);
-        for (j = 0; j < m; j++) {
-          cap[j] = 0.0;
-        }
-        for (k = 0; k < n; k++) {
-          son[k] = -1;
-          ik1 = parent1[k];
-          ik2 = parent2[k];
-          if (distances[i, ik1] < mediana[i]) {
-            son[k] = ik1;
-            cap[ik1] += demands[k];
-          } else if (distances[i, ik2] > mediana[i]) {
-            son[k] = ik2;
-            cap[ik2] += demands[k];
+          if (!onefound && (maximization.Value && fbestAttempt < childFit || !maximization.Value && fbestAttempt > childFit)) {
+            bestAttempt = child;
+            fbestAttempt = childFit;
           }
         }
-        for (k = 0; k < n; k++) {
-          if (son[k] < 0) {
-            j = random.Next(m);
-            son[k] = j;
-            cap[j] += demands[k];
-          }
-        }
-        if (result == null) {
-          result = (IntegerVector)son.Clone();
+      }
+
+      if (!onefound) {
+        var i = random.Next(m);
+        int unassigned;
+        Array.Clear(cap, 0, m);
+        var child = Merge(parent1, parent2, distances, demands, medianDistances, m, n, i, cap, out unassigned);
+        RandomAssignment(random, demands, capacities, m, n, cap, child, ref unassigned);
+
+        var childFit = evaluator.Evaluate(child, weights, distances, installationCosts, demands, capacities, transportationCosts, expectedRandomQuality);
+        evaluatedSolutions.Value++;
+        if (childFit < fbest) {
+          fbest = childFit;
+          result = child;
           onefound = true;
-        } else {
-          double sonQual = evaluator.Evaluate(son, weights, distances, installationCosts, demands, capacities, transportationCosts, expectedRandomQuality);
-          if (sonQual < fbest) {
-            fbest = sonQual;
-            result = (IntegerVector)son.Clone();
-            onefound = true;
-          }
-        }
+        }
+
+        if (!onefound && (maximization.Value && fbestAttempt < childFit || !maximization.Value && fbestAttempt > childFit)) {
+          bestAttempt = child;
+          fbestAttempt = childFit;
+        }
+      }
         /*if (tabufix(&son, 0.5 * sqrt(n * m), round(n * m * log10(n)), &tabufix_it)) {
           solution_cost(&son);
@@ -216 +183 @@
             merge_fixed++;
           }*/
-      }
-      if (result == null) throw new InvalidOperationException("Child could not be created.");
-      return result;
+      return result ?? bestAttempt;
+    }
+
+    private static IntegerVector Merge(IntegerVector p1, IntegerVector p2,
+      DoubleMatrix distances, DoubleArray demands, double[] mediana,
+      int m, int n, int i, double[] cap, out int unassigned) {
+      unassigned = n;
+      var child = new IntegerVector(n);
+      for (var k = 0; k < n; k++) {
+        child[k] = -1;
+        var ik1 = p1[k];
+        var ik2 = p2[k];
+        if (distances[i, ik1] < mediana[i]) {
+          child[k] = ik1;
+          cap[ik1] += demands[k];
+          unassigned--;
+        } else if (distances[i, ik2] > mediana[i]) {
+          child[k] = ik2;
+          cap[ik2] += demands[k];
+          unassigned--;
+        };
+      }
+      return child;
+    }
+
+    private static bool TryRandomAssignment(IRandom random, DoubleArray demands, DoubleArray capacities, int m, int n, double[] cap, IntegerVector child, ref int unassigned) {
+      var unbiasedOrder = Enumerable.Range(0, n).Shuffle(random).ToList();
+      for (var idx = 0; idx < n; idx++) {
+        var k = unbiasedOrder[idx];
+        if (child[k] < 0) {
+          var feasibleInserts = Enumerable.Range(0, m)
+            .Select((v, i) => new { Pos = i, Slack = capacities[i] - cap[i] })
+            .Where(x => x.Slack >= demands[k]).ToList();
+          if (feasibleInserts.Count == 0) return false;
+          var j = feasibleInserts.SampleRandom(random).Pos;
+          child[k] = j;
+          cap[j] += demands[k];
+          unassigned--;
+        }
+      }
+      return true;
+    }
+
+    private static void RandomAssignment(IRandom random, DoubleArray demands, DoubleArray capacities, int m, int n, double[] cap, IntegerVector child, ref int unassigned) {
+      for (var k = 0; k < n; k++) {
+        if (child[k] < 0) {
+          var j = random.Next(m);
+          child[k] = j;
+          cap[j] += demands[k];
+          unassigned--;
+        }
+      }
     }
 
@@ -232 +248 @@
         DemandsParameter.ActualValue, CapacitiesParameter.ActualValue,
         TransportationCostsParameter.ActualValue.Value, ExpectedRandomQualityParameter.ActualValue.Value,
-        EvaluatorParameter.ActualValue);
-    }
-
-    private static double[] Inizialize(DoubleMatrix distances) {
-      int i, j;
-      double mdi;
-      double delta;
-      int ilow, ihigh;
-      bool balance;
-      int operation;
-      int count;
-      int m = distances.Rows;
-
-      double[] mediana = new double[distances.Rows];
-
-      for (i = 0; i < m; i++) {
-        mdi = 0;
-        for (j = 0; j < m; j++) {
-          mdi += distances[i, j];
-        }
-        mediana[i] = mdi / m;
-        balance = false;
-        delta = 1;
-        operation = 0;
-        count = 0;
-        while (!balance && count < 200) {
-          ilow = 0;
-          ihigh = 0;
-          count++;
-          for (j = 0; j < m; j++) {
-            if (distances[i, j] < mediana[i]) ilow++;
-            else if (distances[i, j] > mediana[i]) ihigh++;
-          }
-          if (ilow > ((m + 1) / 2)) {
-            mediana[i] = mediana[i] - delta;
-            if (operation == 1) delta = delta / 2;
-            operation = -1;
-          } else if (ihigh > ((m + 1) / 2)) {
-            mediana[i] = mediana[i] + delta;
-            if (operation == -1) delta = delta / 2;
-            operation = 1;
-          } else balance = true;
-        }
-      }
-      return mediana;
+        EvaluatorParameter.ActualValue, EvaluatedSolutionsParameter.ActualValue);
     }
   }

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/Crossovers/GQAPPathRelinking.cs

@@ -29 +29 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common;
 using HeuristicLab.Random;
 
@@ -138 +137 @@
       var fix = new HashSet<int>();
       var nonFix = new HashSet<int>(Enumerable.Range(0, demands.Length));
-      var phi = new HashSet<int>(IntegerVectorEqualityComparer.GetDifferingIndices(pi_prime, target));
+      var phi = new HashSet<int>((pi_prime.GetDifferingIndices(target)));
 
       while (phi.Any()) {
@@ -162 +161 @@
               for (int i = 0; i < B.Count; i++) {
                 if (IsBetter(maximization.Value, solution.Quality.Value, B[i].Quality.Value)) {
-                  var similarity = IntegerVectorEqualityComparer.GetSimilarity(solution.Assignment, B[i].Assignment);
+                  var similarity = HammingSimilarityCalculator.CalculateSimilarity(solution.Assignment, B[i].Assignment);
                   if (similarity == 1.0) {
                     mostSimilarIndex = -1;
@@ -177 +176 @@
               bool contains = false;
               foreach (var b in B) {
-                if (!IntegerVectorEqualityComparer.GetDifferingIndices(solution.Assignment, b.Assignment).Any()) {
+                if (!solution.Assignment.GetDifferingIndices(b.Assignment).Any()) {
                   contains = true;
                   break;
@@ -190 +189 @@
           if (maximization.Value) pi = B.SampleProportional(random, 1, B.Select(x => x.Quality.Value), false).First();
           else pi = B.SampleProportional(random, 1, B.Select(x => 1.0 / x.Quality.Value), false).First();
-          var diff = IntegerVectorEqualityComparer.GetDifferingIndices(pi.Assignment, target);
+          var diff = pi.Assignment.GetDifferingIndices(target);
           var I = phi.Except(diff);
           var i = I.SampleRandom(random);
@@ -204 +203 @@
           }
         } else return result;
-        phi = new HashSet<int>(IntegerVectorEqualityComparer.GetDifferingIndices(pi_prime, target));
+        phi = new HashSet<int>(pi_prime.GetDifferingIndices(target));
       }
 

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Operators/PopulationReducers/GQAPQualitySimilarityReducer.cs

@@ -98 +98 @@
 
       foreach (var candidate in candidates) {
-        double[] similarities = population.Select(x => IntegerVectorEqualityComparer.GetSimilarity(x.Solution, candidate.Solution)).ToArray();
+        double[] similarities = population.Select(x => HammingSimilarityCalculator.CalculateSimilarity(x.Solution, candidate.Solution)).ToArray();
         if (!similarities.Any()) {
           population.Add(candidate);

branches/GeneralizedQAP/UnitTests/CordeauCrossoverTest.cs

@@ -21 +21 @@
 
 using System.Linq;
+using System.Threading;
 using HeuristicLab.Data;
-using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Problems.GeneralizedQuadraticAssignment;
 using HeuristicLab.Problems.Instances.CordeauGQAP;
@@ -34 +34 @@
     public void CordeauCrossoverFunctionalityTest() {
       var provider = new CordeauGQAPInstanceProvider();
-      var instance = provider.LoadData(provider.GetDataDescriptors().First());
+      var instance = provider.LoadData(provider.GetDataDescriptors().Single(x => x.Name == "20-15-75"));
       var gqap = new GeneralizedQuadraticAssignmentProblem();
       gqap.Load(instance);
+      var evaluator = gqap.Evaluator;
 
-      var random = new MersenneTwister();
       for (int i = 0; i < 100; i++) {
-        var parent1 = new IntegerVector(gqap.Demands.Length, random, 0, gqap.Capacities.Length);
-        var parent2 = new IntegerVector(gqap.Demands.Length, random, 0, gqap.Capacities.Length);
+        var random = new MersenneTwister((uint)i);
+        var parent1 = GreedyRandomizedSolutionCreator.CreateSolution(random, gqap.Demands, gqap.Capacities, gqap.Evaluator, 100, true, CancellationToken.None);
+        var parent2 = GreedyRandomizedSolutionCreator.CreateSolution(random, gqap.Demands, gqap.Capacities, gqap.Evaluator, 100, true, CancellationToken.None);
 
         try {
@@ -49 +50 @@
             parent2,
             new DoubleValue(gqap.Evaluator.Evaluate(parent2, gqap.Weights, gqap.Distances, gqap.InstallationCosts, gqap.Demands, gqap.Capacities, gqap.TransportationCosts, gqap.ExpectedRandomQuality)),
-            gqap.Weights, gqap.Distances, gqap.InstallationCosts, gqap.Demands, gqap.Capacities, gqap.TransportationCosts, gqap.ExpectedRandomQuality, gqap.Evaluator);
+            gqap.Weights, gqap.Distances, gqap.InstallationCosts, gqap.Demands, gqap.Capacities, gqap.TransportationCosts, gqap.ExpectedRandomQuality, gqap.Evaluator,
+            new IntValue(0));
         } catch {
           Assert.Fail("Error during crossover");

branches/GeneralizedQAP/UnitTests/UnitTests.csproj

@@ -65 +65 @@
       <Private>True</Private>
     </Reference>
-    <Reference Include="HeuristicLab.Optimization-3.3">
-      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Optimization-3.3.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="HeuristicLab.Parameters-3.3">
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
@@ -115 +111 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj">
+      <Project>{14ab8d24-25bc-400c-a846-4627aa945192}</Project>
+      <Name>HeuristicLab.Optimization-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common\3.3\HeuristicLab.Problems.GeneralizedQuadraticAssignment.Common-3.3.csproj">
       <Project>{DA367BE5-4F53-4243-933B-32AAB86189D5}</Project>

@@ -2 +2 @@
 TestResults
 *.user
+.vs

@@ -1 +1 @@
 obj
 Plugin.cs
+*.user