Changeset 7621 for trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators

Timestamp:

03/15/12 14:29:53 (12 years ago)

Author:

abeham

Message:

#1396:

• Fixed loading of instances that did not specify coordinates (visual or actual ones)
• Turned coordinates into an OptionalValueParameter
• Added checks in relevant operators that throw an exception if they can neither find coordinates or distances
• Writing a message to the visualization if coordinates are not defined

File:

• trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TSPPathMoveEvaluator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.TravelingSalesman/3.3/MoveEvaluators/TSPPathMoveEvaluator.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -78 +79 @@
         DistanceMatrix distanceMatrix = DistanceMatrixParameter.ActualValue;
         if (distanceMatrix == null) {
+          if (coordinates == null) throw new InvalidOperationException("Neither a distance matrix nor coordinates were given.");
           distanceMatrix = CalculateDistanceMatrix(coordinates);
           DistanceMatrixParameter.ActualValue = distanceMatrix;
         }
         relativeQualityDifference = EvaluateByDistanceMatrix(permutation, distanceMatrix);
-      } else relativeQualityDifference = EvaluateByCoordinates(permutation, coordinates);
+      } else {
+        if (coordinates == null) throw new InvalidOperationException("No coordinates were given.");
+        relativeQualityDifference = EvaluateByCoordinates(permutation, coordinates);
+      }
       DoubleValue moveQuality = MoveQualityParameter.ActualValue;
       if (moveQuality == null) MoveQualityParameter.ActualValue = new DoubleValue(QualityParameter.ActualValue.Value + relativeQualityDifference);