Changeset 14487 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR

Timestamp:

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

Author:

sraggl

Message:

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

Location:

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3

Files:

• HeuristicLab.Algorithms.MemPR-3.3.csproj (modified) (1 diff)
• LinearLinkage/LinearLinkageMemPR.cs (modified) (1 diff)
• LinearLinkage/SolutionModel/Univariate/UnivariateSolutionModel.cs (modified) (1 diff)

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/HeuristicLab.Algorithms.MemPR-3.3.csproj

@@ -162 +162 @@
       <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.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/LinearLinkage/LinearLinkageMemPR.cs

@@ -250 +250 @@
       var p1 = p1Scope.Solution;
       var p2 = p2Scope.Solution;
-      var transfered = new bool[p1.Length];
-      var subspace = new bool[p1.Length];
-      var lleeChild = new int[p1.Length];
-      var lleep1 = p1.ToLLEe();
-      var lleep2 = p2.ToLLEe();
-      for (var i = p1.Length - 1; i >= 0; i--) {
-        // Step 1
-        subspace[i] = p1[i] != p2[i];
-        var p1IsEnd = p1[i] == i;
-        var p2IsEnd = p2[i] == i;
-        if (p1IsEnd & p2IsEnd) {
-          transfered[i] = true;
-        } else if (p1IsEnd | p2IsEnd) {
-          transfered[i] = Context.Random.NextDouble() < 0.5;
-        }
-        lleeChild[i] = i;
-
-        // Step 2
-        if (transfered[i]) continue;
-        var end1 = lleep1[i];
-        var end2 = lleep2[i];
-        var containsEnd1 = transfered[end1];
-        var containsEnd2 = transfered[end2];
-        if (containsEnd1 & containsEnd2) {
-          if (Context.Random.NextDouble() < 0.5) {
-            lleeChild[i] = end1;
-          } else {
-            lleeChild[i] = end2;
-          }
-        } else if (containsEnd1) {
-          lleeChild[i] = end1;
-        } else if (containsEnd2) {
-          lleeChild[i] = end2;
-        } else {
-          if (Context.Random.NextDouble() < 0.5) {
-            lleeChild[i] = lleeChild[p1[i]];
-          } else {
-            lleeChild[i] = lleeChild[p2[i]];
-          }
-        }
-      }
-      var child = new Encodings.LinearLinkageEncoding.LinearLinkage(lleeChild.Length);
-      child.FromLLEe(lleeChild);
-      
-      return ToScope(child);
+      return ToScope(GroupCrossover.Apply(Context.Random, p1, p2));
     }
 

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/LinearLinkage/SolutionModel/Univariate/UnivariateSolutionModel.cs

@@ -63 +63 @@
     public Encodings.LinearLinkageEncoding.LinearLinkage Sample() {
       var N = Frequencies.Rows;
-      var centroid = new Encodings.LinearLinkageEncoding.LinearLinkage(N);
+      var centroid = Encodings.LinearLinkageEncoding.LinearLinkage.SingleElementGroups(N);
       var dict = new Dictionary<int, int>();
       for (var i = N - 1; i >= 0; i--) {