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

Timestamp:

12/16/16 17:10:05 (8 years ago)

Author:

abeham

Message:

#2701:

• Reusing similiarty calculator in BinaryMemPR
• Fixing distance calculation for linear linkage and LinearLinkageMemPR
• Small changes to base algorithm
• Added biased model trainer for permutation (rank and fitness)
• Fixing best known quality calculation for GCP

File:

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

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

@@ -66 +66 @@
 
     protected override double Dist(ISingleObjectiveSolutionScope<BinaryVector> a, ISingleObjectiveSolutionScope<BinaryVector> b) {
-      var len = a.Solution.Length;
-      var acode = a.Solution;
-      var bcode = b.Solution;
-      var hamming = 0;
-      for (var i = 0; i < len; i++)
-        if (acode[i] != bcode[i]) hamming++;
-      return hamming / (double)len;
+      return 1.0 - HammingSimilarityCalculator.CalculateSimilarity(a.Solution, b.Solution);
     }