Changeset 14487 for branches/MemPRAlgorithm/HeuristicLab.Problems.GraphColoring/3.3

Timestamp:

12/14/16 10:16:50 (8 years ago)

Author:

sraggl

Message:

#2701 Merged with trunk to get new version of LinearLinkageEncoding
Improved MoveGenerator

Location:

branches/MemPRAlgorithm/HeuristicLab.Problems.GraphColoring/3.3

Files:

• GraphColoringProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.GraphColoring-3.3.csproj (modified) (1 diff)

branches/MemPRAlgorithm/HeuristicLab.Problems.GraphColoring/3.3/GraphColoringProblem.cs

@@ -114 +114 @@
       var fitFun = FitnessFunctionParameter.Value.Value;
       var adjList = adjacencyListParameter.Value;
-      var lle = individual.LinearLinkage(Encoding.Name).ToLLEe(); // LLE-e encoding uses the highest indexed member as group number
+      var lle = individual.LinearLinkage(Encoding.Name).ToEndLinks(); // LLE-e encoding uses the highest indexed member as group number
 
       switch (fitFun) {
@@ -158 +158 @@
 
       var adjList = AdjacencyListParameter.Value;
-      var lle = best.ToLLEe();
+      var lle = best.ToEndLinks();
       var conflicts = 0;
       var colors = lle.Distinct().Count();

branches/MemPRAlgorithm/HeuristicLab.Problems.GraphColoring/3.3/HeuristicLab.Problems.GraphColoring-3.3.csproj

@@ -88 +88 @@
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Encodings.LinearLinkageEncoding\3.3\HeuristicLab.Encodings.LinearLinkageEncoding-3.3.csproj">
-      <Project>{be698769-975a-429e-828c-72bb2b6182c8}</Project>
-      <Name>HeuristicLab.Encodings.LinearLinkageEncoding-3.3</Name>
-      <Private>False</Private>
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.LinearLinkageEncoding\3.3\HeuristicLab.Encodings.LinearLinkageEncoding-3.4.csproj">
+      <Project>{166507c9-ef26-4370-bb80-699742a29d4f}</Project>
+      <Name>HeuristicLab.Encodings.LinearLinkageEncoding-3.4</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Operators\3.3\HeuristicLab.Operators-3.3.csproj">