Changeset 8720 for trunk/sources/HeuristicLab.Problems.VehicleRouting

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

Location:

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4

Files:

• SimilarityCalculators/VRPSimilarityCalculator.cs (modified) (1 diff)
• VehicleRoutingProblem.cs (modified) (4 diffs)

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);
     }
   }

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -24 +24 @@
 using System.Drawing;
 using System.Linq;
+using HeuristicLab.Analysis;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -112 +113 @@
       set { SolutionCreatorParameter.Value = value; }
     }
+    private SingleObjectivePopulationDiversityAnalyzer SingleObjectivePopulationDiversityAnalyzer {
+      get { return Operators.OfType<SingleObjectivePopulationDiversityAnalyzer>().FirstOrDefault(); }
+    }
     #endregion
 
@@ -244 +248 @@
           ApplicationManager.Manager.GetInstances<IGeneralVRPOperator>().Cast<IOperator>()).OrderBy(op => op.Name));
         Operators.Add(new VRPSimilarityCalculator());
+        Operators.Add(new SingleObjectivePopulationDiversityAnalyzer());
 
         IVRPCreator defaultCreator = null;
@@ -277 +282 @@
           op.QualityVariableName = ProblemInstance.SolutionEvaluator.QualityParameter.ActualName;
           op.ProblemInstance = ProblemInstance;
+        }
+        if (SingleObjectivePopulationDiversityAnalyzer != null) {
+          SingleObjectivePopulationDiversityAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
+          SingleObjectivePopulationDiversityAnalyzer.QualityParameter.ActualName = ProblemInstance.SolutionEvaluator.QualityParameter.ActualName;
+          SingleObjectivePopulationDiversityAnalyzer.ResultsParameter.ActualName = "Results";
+          SingleObjectivePopulationDiversityAnalyzer.SimilarityCalculator = Operators.OfType<VRPSimilarityCalculator>().SingleOrDefault();
         }
       }