Changeset 9363 for branches/OaaS/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.VehicleRouting (modified) (1 prop)
• HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs (modified) (2 diffs)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPEvaluator.cs

@@ -118 +118 @@
     }
 
-    public VRPEvaluation Evaluate(IVRPProblemInstance instance, IVRPEncoding solution) {
+    public virtual VRPEvaluation Evaluate(IVRPProblemInstance instance, IVRPEncoding solution) {
       VRPEvaluation evaluation = CreateTourEvaluation();
 

branches/OaaS/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -37 +37 @@
     IVRPEvaluator moveEvaluator;
 
+    private object locker = new object();
+
     public IVRPEvaluator MoveEvaluator {
       get {
-        if (evaluator == null)
-          return null;
-        else {
-          if (moveEvaluator == null) {
-            moveEvaluator = evaluator.Clone() as IVRPEvaluator;
-
-            foreach (IParameter parameter in moveEvaluator.Parameters) {
-              if (parameter is ILookupParameter
-                && parameter != moveEvaluator.ProblemInstanceParameter
-                && parameter != moveEvaluator.VRPToursParameter) {
-                (parameter as ILookupParameter).ActualName =
-                  VRPMoveEvaluator.MovePrefix +
-                  (parameter as ILookupParameter).ActualName;
+        lock (locker) {
+          if (evaluator == null)
+            return null;
+          else {
+            if (moveEvaluator == null) {
+              moveEvaluator = evaluator.Clone() as IVRPEvaluator;
+
+              foreach (IParameter parameter in moveEvaluator.Parameters) {
+                if (parameter is ILookupParameter
+                  && parameter != moveEvaluator.ProblemInstanceParameter
+                  && parameter != moveEvaluator.VRPToursParameter) {
+                  (parameter as ILookupParameter).ActualName =
+                    VRPMoveEvaluator.MovePrefix +
+                    (parameter as ILookupParameter).ActualName;
+                }
               }
             }
+
+            return moveEvaluator;
           }
-
-          return moveEvaluator;
         }
       }
@@ -176 +180 @@
 
       set {
-        moveEvaluator = null;
-        evaluator = value;
-        EvalBestKnownSolution();
+        lock (locker) {
+          moveEvaluator = null;
+          evaluator = value;
+          EvalBestKnownSolution();
+        }
       }
     }
 
     public virtual double GetDistance(int start, int end, IVRPEncoding solution) {
-      double distance = 0.0;
       if (distanceMatrix == null && UseDistanceMatrix.Value) {
-        distanceMatrix = DistanceMatrix = CreateDistanceMatrix();
-      }
-
-      if (distanceMatrix != null)
-        distance = distanceMatrix[start, end];
-      else
-        distance = CalculateDistance(start, end);
-
-      return distance;
+        if (DistanceMatrix == null) DistanceMatrix = CreateDistanceMatrix();
+        distanceMatrix = DistanceMatrix;
+      }
+
+      if (distanceMatrix != null) return distanceMatrix[start, end];
+      return CalculateDistance(start, end);
     }
 

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages