Changeset 14492 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3

Timestamp:

12/14/16 20:45:46 (8 years ago)

Author:

abeham

Message:

#2701:

• Updated LLE encoding
  • Made folder for version 3.4
  • Added conversion from and to LLE-b representation (back-links)
  • Updated moves and movegenerator to replace bidirectionaldictionary with LLE-b representation
• Updated MemPR (linear linkage)
  • Updated tabu walk
• Added test for conversion between LLE-e and LLE and LLE-b and LLE
• Updated test for move apply/undo and added test for applying in sequence

Location:

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3

Files:

• HeuristicLab.Algorithms.MemPR-3.3.csproj (modified) (1 diff)
• LinearLinkage/LinearLinkageMemPR.cs (modified) (6 diffs)
• Plugin.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.4.csproj">
+    <ProjectReference Include="..\..\HeuristicLab.Encodings.LinearLinkageEncoding\3.4\HeuristicLab.Encodings.LinearLinkageEncoding-3.4.csproj">
       <Project>{166507c9-ef26-4370-bb80-699742a29d4f}</Project>
       <Name>HeuristicLab.Encodings.LinearLinkageEncoding-3.4</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Encodings.PermutationEncoding\3.3\HeuristicLab.Encodings.PermutationEncoding-3.3.csproj">

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

@@ -120 +120 @@
         tabu[i, current[i]] = quality;
       }
-      
+
       // this dictionary holds the last relevant links
-      var links = new BidirectionalDictionary<int, int>();
+      var groupItems = new List<int>();
+      var lleb = current.ToBackLinks();
       Move bestOfTheRest = null;
       var bestOfTheRestF = double.NaN;
@@ -128 +129 @@
       for (var iter = 0; iter < int.MaxValue; iter++) {
         // clear the dictionary before a new pass through the array is made
-        links.Clear();
+        groupItems.Clear();
         for (var i = 0; i < current.Length; i++) {
           if (subspace != null && !subspace[i]) {
-            links.RemoveBySecond(i);
-            links.Add(i, current[i]);
+            if (lleb[i] != i)
+              groupItems.Remove(lleb[i]);
+            groupItems.Add(i);
             continue;
           }
@@ -141 +143 @@
             if (bestOfTheRest != null) {
               bestOfTheRest.Apply(current);
+              bestOfTheRest.ApplyToLLEb(lleb);
               currentScope.Fitness = bestOfTheRestF;
               quality = bestOfTheRestF;
@@ -162 +165 @@
             break;
           } else {
-            foreach (var move in MoveGenerator.GenerateForItem(i, next, links)) {
+            foreach (var move in MoveGenerator.GenerateForItem(i, groupItems, current, lleb)) {
               // we intend to break link i -> next
               var qualityToBreak = tabu[i, next];
@@ -185 +188 @@
                 if (isAspired) bestQuality = quality;
 
-                move.UpdateLinks(links);
+                move.ApplyToLLEb(lleb);
 
                 if (FitnessComparer.IsBetter(maximization, moveF, bestOfTheWalkF)) {
@@ -209 +212 @@
             }
           }
-          links.RemoveBySecond(i);
-          links.Add(i, current[i]);
+          if (lleb[i] != i)
+            groupItems.Remove(lleb[i]);
+          groupItems.Add(i);
           if (evaluations >= maxEvals) break;
           if (token.IsCancellationRequested) break;

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Plugin.cs

@@ -33 +33 @@
   [PluginDependency("HeuristicLab.Data", "3.3")]
   [PluginDependency("HeuristicLab.Encodings.BinaryVectorEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.LinearLinkageEncoding", "3.4")]
+  [PluginDependency("HeuristicLab.Encodings.PermutationEncoding", "3.3")]
   [PluginDependency("HeuristicLab.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]