Changeset 5210 for trunk/sources/HeuristicLab.Problems.TravelingSalesman

Timestamp:

01/05/11 00:49:56 (13 years ago)

Author:

swagner

Message:

Adapted distance matrix calculation in TSPCoordinatesPathEvaluator to avoid that multiple distance matrices are created, if the evaluator is executed in parallel (#1333)

File:

• trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPCoordinatesPathEvaluator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/Evaluators/TSPCoordinatesPathEvaluator.cs

@@ -34 +34 @@
   [StorableClass]
   public abstract class TSPCoordinatesPathEvaluator : TSPEvaluator, ITSPCoordinatesPathEvaluator {
+    private object locker = new object();
+
     public ILookupParameter<Permutation> PermutationParameter {
       get { return (ILookupParameter<Permutation>)Parameters["Permutation"]; }
@@ -77 +79 @@
 
         if (dm == null) {  // calculate distance matrix
-          DoubleMatrix c = CoordinatesParameter.ActualValue;
-
-          dm = new DistanceMatrix(c.Rows, c.Rows);
-          for (int i = 0; i < dm.Rows; i++) {
-            for (int j = 0; j < dm.Columns; j++)
-              dm[i, j] = CalculateDistance(c[i, 0], c[i, 1], c[j, 0], c[j, 1]);
+          lock (locker) {
+            dm = DistanceMatrixParameter.ActualValue;
+            if (dm == null) {  // check again to avoid race condition
+              DoubleMatrix c = CoordinatesParameter.ActualValue;
+              dm = new DistanceMatrix(c.Rows, c.Rows);
+              for (int i = 0; i < dm.Rows; i++) {
+                for (int j = 0; j < dm.Columns; j++)
+                  dm[i, j] = CalculateDistance(c[i, 0], c[i, 1], c[j, 0], c[j, 1]);
+              }
+              DistanceMatrixParameter.ActualValue = (DistanceMatrix)dm.AsReadOnly();
+            }
           }
-          DistanceMatrixParameter.ActualValue = (DistanceMatrix)dm.AsReadOnly();
         }