Changeset aaf2113307 in tspsg for src/tspsolver.cpp

Timestamp:

Aug 3, 2009, 5:15:46 PM (15 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.3.145-beta1-symbian, 0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme

Children:

f44855d99e

Parents:

e96fad3079

Message:

+ Implemented File/Save? action.
+ Added "Save Solution" and "Back to Task" buttons to Solution tab for better usability.

• Increased maximum number of cities to 20. Solving for 18-20 cities is already takes much time, so I thought it doesn't make sense to increase more.
• Columns and rows are now resized to contents on all platforms.

File:

• src/tspsolver.cpp (modified) (3 diffs)

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[r][c] == 0) && !forbidden.values(r).contains(c)) {
+                        if (matrix[r][c] == 0) {
                                 sum = findMinInRow(r,matrix,c) + findMinInCol(c,matrix,r);
                                 if (sum > h) {
@@ -154 +155 @@
 int nRow, nCol;
         while (route.size() < nCities) {
-                forbidden.clear();
+//              forbidden.clear();
                 step->alts = findCandidate(step->matrix,nRow,nCol,s);
                 while (hasSubCycles(nRow,nCol)) {
-                        forbidden[nRow] = nCol;
+//                      forbidden[nRow] = nCol;
                         step->matrix[nRow][nCol] = INFINITY;
                         step->price += align(step->matrix);
@@ -204 +205 @@
         }
 
-        pd.reset();
+        if (!root && !pd.wasCanceled()) {
+                pd.reset();
+                QMessageBox(QMessageBox::Warning,trUtf8("Solution Result"),trUtf8("Unable to find solution.\nMaybe, this task has no solutions."),QMessageBox::Ok,parent).exec();
+        }
+
         qApp->processEvents();
 
-        if (!root && !pd.wasCanceled()) {
-                QMessageBox(QMessageBox::Warning,trUtf8("Solution Result"),trUtf8("This task has no solution."),QMessageBox::Ok,parent).exec();
-        }
-
         return root;
 }