Changeset 11060 for trunk

Timestamp:

06/30/14 18:30:14 (10 years ago)

Author:

abeham

Message:

#2204: allow to view subtour in PathTSPTourView

File:

• trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views/3.3/PathTSPTourView.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.TravelingSalesman.Views/3.3/PathTSPTourView.cs

@@ -108 +108 @@
 
             using (Graphics graphics = Graphics.FromImage(bitmap)) {
-              if ((permutation != null) && (permutation.Length == coordinates.Rows) && (permutation.Validate())) {
+              if (permutation != null && permutation.Length > 1) {
                 Point[] tour = new Point[permutation.Length];
                 for (int i = 0; i < permutation.Length; i++) {
-                  tour[i] = points[permutation[i]];
+                  if (permutation[i] >= 0 && permutation[i] < points.Length)
+                    tour[i] = points[permutation[i]];
                 }
                 graphics.DrawPolygon(Pens.Black, tour);