Changeset 12288 for branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Crossovers/GroupCrossover.cs

Timestamp:

04/06/15 22:41:24 (9 years ago)

Author:

abeham

Message:

#2319:

• Changed encoding to represent linkages in LLE (as opposed to LLE-e)
• Added GraftManipulator
• Added repair procedure
• Improved performance of some crossovers

File:

• branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Crossovers/GroupCrossover.cs (modified) (2 diffs)

branches/LinearLinkage/HeuristicLab.Encodings.LinearLinkageEncoding/3.3/Crossovers/GroupCrossover.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -53 +54 @@
       for (var i = 0; i < length; i++) {
         if (endNodes.Contains(i)) continue;
-        if (endNodes.Contains(p1[i]) && endNodes.Contains(p2[i])) {
+        var p1End = endNodes.Contains(p1[i]);
+        var p2End = endNodes.Contains(p2[i]);
+        if ((p1End && p2End) || (!p1End && !p2End)) {
           child[i] = random.NextDouble() < 0.5 ? p1[i] : p2[i];
-        } else if (endNodes.Contains(p1[i])) {
+        } else if (p1End) {
           child[i] = p1[i];
-        } else if (endNodes.Contains(p2[i])) {
+        } else {
           child[i] = p2[i];
-        } else {
-          var a = p1[i];
-          var b = p2[i];
-          while (true) {
-            if (endNodes.Contains(p2[a])) {
-              child[i] = p2[a];
-              break;
-            }
-            if (endNodes.Contains(p1[b])) {
-              child[i] = p1[b];
-              break;
-            }
-            var tmp = b;
-            b = p2[a];
-            a = p1[tmp];
-          }
         }
       }
+      child.LinearizeTreeStructures();
       return child;
     }