Changeset 14453 for branches/MemPRAlgorithm/HeuristicLab.Problems.TravelingSalesman

Timestamp:

12/05/16 12:27:19 (8 years ago)

Author:

abeham

Message:

#2701:

• Worked on MemPR algorithm for permutations
  • Made Evaluate() method mostly thread-safe and moved evaluated solutions counting to caller
• Removed TSP specific similarity calculator (it is actually not specific to the TSP) and added it to the permutation encoding as HammingSimilarityCalculator
• Fixed bug in qap basicproblem

Location:

branches/MemPRAlgorithm/HeuristicLab.Problems.TravelingSalesman/3.3

Files:

• SimilarityCalculators/TSPSimilarityCalculator.cs (modified) (2 diffs)
• TravelingSalesmanProblem.cs (modified) (1 diff)

branches/MemPRAlgorithm/HeuristicLab.Problems.TravelingSalesman/3.3/SimilarityCalculators/TSPSimilarityCalculator.cs

@@ -25 +25 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization.Operators;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Problems.TravelingSalesman {
@@ -34 +35 @@
   /// </remarks>
   [Item("TSPSimilarityCalculator", "An operator that performs similarity calculation between two traveling salesman solutions. The operator calculates the similarity based on the number of edges the two solutions have in common.")]
-  public sealed class TSPSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
+  [Obsolete("Please use the HammingSimilarityCalculator in the Encodings.PermutationEncoding plugin.")]
+  [NonDiscoverableType]
+  internal sealed class TSPSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
     protected override bool IsCommutative { get { return true; } }
 

branches/MemPRAlgorithm/HeuristicLab.Problems.TravelingSalesman/3.3/TravelingSalesmanProblem.cs

@@ -233 +233 @@
       Operators.Add(new TSPPathRelinker());
       Operators.Add(new TSPSimultaneousPathRelinker());
-      Operators.Add(new TSPSimilarityCalculator());
+      Operators.Add(new HammingSimilarityCalculator());
       Operators.Add(new QualitySimilarityCalculator());
-      Operators.Add(new NoSimilarityCalculator());
 
       Operators.Add(new BestTSPSolutionAnalyzer());