Changeset 14482 for trunk/sources

Timestamp:

12/12/16 17:14:14 (7 years ago)

Author:

pfleck

Message:

#2705

• Added best-known solutions to the Solomon benchmark set.
• When the distance matrix is calculate internally for performance optimization, the DistanceMatrix-parameter is not set anymore, because this matrix is actually not part of the problem instance. This also fixes issues that qualities of known-solutions are wrongfully discarded due to a problem instance change that is actually not a change.

Location:

trunk/sources

Files:

• HeuristicLab.Problems.Instances.VehicleRouting/3.4/Data/Solomon.opt.zip (modified) (previous)
• HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -190 +190 @@
     public virtual double GetDistance(int start, int end, IVRPEncoding solution) {
       if (distanceMatrix == null && UseDistanceMatrix.Value) {
-        if (DistanceMatrix == null) DistanceMatrix = CreateDistanceMatrix();
-        distanceMatrix = DistanceMatrix;
+        distanceMatrix = DistanceMatrix ?? CreateDistanceMatrix();
       }