Changeset 14556 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Binary

Timestamp:

01/11/17 01:53:44 (8 years ago)

Author:

abeham

Message:

#2701:

• fixed bug with breeding
• fixed permutation sub-space hillclimber
• improved speed of inversion by calling Array.Reverse(int, int) instead of using a for-loop
• added delinking for relative-undirected permutations

File:

• branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Binary/BinaryMemPR.cs (modified) (1 diff)

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/Binary/BinaryMemPR.cs ¶

@@ -160 +160 @@
       while (evaluations < N) {
         BinaryVector c = null;
-        var xochoice = Context.Random.Next(3);
-        switch (xochoice) {
-          case 0: c = NPointCrossover.Apply(Context.Random, p1.Solution, p2.Solution, new IntValue(1)); break;
-          case 1: c = NPointCrossover.Apply(Context.Random, p1.Solution, p2.Solution, new IntValue(2)); break;
-          case 2: c = UniformCrossover.Apply(Context.Random, p1.Solution, p2.Solution); break;
-        }
+        var xochoice = Context.Random.NextDouble();
+        if (xochoice < 0.2)
+          c = NPointCrossover.Apply(Context.Random, p1.Solution, p2.Solution, new IntValue(1));
+        else if (xochoice < 0.5)
+          c = NPointCrossover.Apply(Context.Random, p1.Solution, p2.Solution, new IntValue(2));
+        else c = UniformCrossover.Apply(Context.Random, p1.Solution, p2.Solution);
         if (cache.Contains(c)) {
           cacheHits++;
-          if (cacheHits > 10) break;
+          if (cacheHits > 20) break;
           continue;
         }
+        probe.Solution = c;
         Context.Evaluate(probe, token);
         evaluations++;