Changeset 14550 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/LinearLinkage

Timestamp:

01/05/17 17:50:03 (8 years ago)

Author:

abeham

Message:

#2701:

• Added BinaryVectorEqualityComparer (identical to the one in the P3 plugin) to binaryvector plugin
• Added delinking for absolute coded permutations
• Some tweaks

File:

• branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/LinearLinkage/LinearLinkageMemPR.cs (modified) (4 diffs)

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

@@ -32 +32 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Random;
 
 namespace HeuristicLab.Algorithms.MemPR.Grouping {
@@ -55 +54 @@
     }
 
-    protected override bool Eq(ISingleObjectiveSolutionScope<LinearLinkage> a, ISingleObjectiveSolutionScope<LinearLinkage> b) {
-      var s1 = a.Solution;
-      var s2 = b.Solution;
-      if (s1.Length != s2.Length) return false;
-      for (var i = 0; i < s1.Length; i++)
-        if (s1[i] != s2[i]) return false;
+    protected override bool Eq(LinearLinkage a, LinearLinkage b) {
+      if (a.Length != b.Length) return false;
+      for (var i = 0; i < a.Length; i++)
+        if (a[i] != b[i]) return false;
       return true;
     }
@@ -256 +253 @@
       var evaluations = 1;
       ISingleObjectiveSolutionScope<LinearLinkage> offspring = null;
-      for (; evaluations < Context.LocalSearchEvaluations; evaluations++) {
+      for (; evaluations < p1Scope.Solution.Length; evaluations++) {
         var code = GroupCrossover.Apply(Context.Random, p1Scope.Solution, p2Scope.Solution);
         if (cache.Contains(code)) {
@@ -297 +294 @@
           m.Apply(probe.Solution);
           var distAfter = Dist(probe, b);
+          // consider all moves that would increase the distance between probe and b
+          // or decrease it depending on whether we do delinking or relinking
           if (delink && distAfter > distBefore || !delink && distAfter < distBefore) {
             var beforeQ = probe.Fitness;