Changeset 55 in tspsg-svn for trunk/src/tspsolver.cpp

Timestamp:

Aug 11, 2009, 6:54:01 PM (15 years ago)

Author:

laleppa

Message:

+ PDF format option when saving solution if platform supports printing.

• Check alternative candidates for subcycles.

File:

• trunk/src/tspsolver.cpp (modified) (2 diffs)

trunk/src/tspsolver.cpp

@@ -97 +97 @@
         for (int r = 0; r < nCities; r++)
                 for (int c = 0; c < nCities; c++)
-//                      if ((matrix[r][c] == 0) && !forbidden.values(r).contains(c)) {
+//                      if ((matrix.at(r).at(c) == 0) && !forbidden.values(r).contains(c)) {
                         if (matrix.at(r).at(c) == 0) {
                                 sum = findMinInRow(r,matrix,c) + findMinInCol(c,matrix,r);
@@ -105 +105 @@
                                         nCol = c;
                                         alts = false;
-                                } else if (sum == h)
+                                } else if ((sum == h) && !hasSubCycles(r,c))
                                         alts = true;
                         }