Changeset 8720 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/SimilarityCalculators/VRPSimilarityCalculator.cs

Timestamp:

10/02/12 18:59:15 (12 years ago)

Author:

jkarder

Message:

#1899: applied the changes suggested by ascheibe in comment:6:ticket:1899

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/SimilarityCalculators/VRPSimilarityCalculator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/SimilarityCalculators/VRPSimilarityCalculator.cs

@@ -92 +92 @@
 
     public override double CalculateSolutionSimilarity(IScope leftSolution, IScope rightSolution) {
-      var sol1 = leftSolution.Variables[SolutionVariableName].Value as PotvinEncoding;
-      var sol2 = rightSolution.Variables[SolutionVariableName].Value as PotvinEncoding;
+      var sol1 = leftSolution.Variables[SolutionVariableName].Value as IVRPEncoding;
+      var sol2 = rightSolution.Variables[SolutionVariableName].Value as IVRPEncoding;
 
-      return CalculateSimilarity(sol1, sol2);
+      var potvinSol1 = sol1 is PotvinEncoding ? sol1 as PotvinEncoding : PotvinEncoding.ConvertFrom(sol1, ProblemInstance);
+      var potvinSol2 = sol2 is PotvinEncoding ? sol2 as PotvinEncoding : PotvinEncoding.ConvertFrom(sol2, ProblemInstance);
+
+      return CalculateSimilarity(potvinSol1, potvinSol2);
     }
   }