Changeset 14454 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/MemPRAlgorithm.cs

Timestamp:

12/05/16 16:06:18 (8 years ago)

Author:

abeham

Message:

#2701:

• Worked on MemPR algorithm for permutations
• Refactored TSP

File:

• branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/MemPRAlgorithm.cs (modified) (2 diffs)

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

@@ -557 +557 @@
         || Context.Population.Any(p => IsBetter(offspring, p))) return offspring;
 
-      if (HillclimbingSuited(offspring))
+      if (IsBetter(offspring.Fitness, Context.BestQuality))
+        HillClimb(offspring, token); // perform hillclimb in full solution space
+      else if (HillclimbingSuited(offspring))
         HillClimb(offspring, token, subspace); // perform hillclimb in the solution sub-space
       return offspring;
@@ -587 +589 @@
       if (dist1 > 0 && dist2 > 0) {
         var subspace = CalculateSubspace(new[] { a.Solution, b.Solution }, inverse: true);
-        if (HillclimbingSuited(child)) {
-          HillClimb(child, token, subspace);
+        if (IsBetter(child.Fitness, Context.BestQuality))
+          HillClimb(child, token); // perform hillclimb in full solution space
+        else if (HillclimbingSuited(child)) {
+          HillClimb(child, token, subspace); // perform hillclimb in solution sub-space
         }
       }