Changeset 60 in tspsg-svn for trunk/src/tspsolver.h

Timestamp:

Sep 2, 2009, 2:37:39 AM (15 years ago)

Author:

laleppa

Message:

+ Warning about possible non-optimal result.

• Resulting path is now sorted, always starts from City 1 and has "City 1 -> City n -> ... -> City 1" format.
• Translations updated.

File:

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

trunk/src/tspsolver.h

@@ -47 +47 @@
 public:
         CTSPSolver();
+        QString getSortedPath() const;
+        bool isOptimal() const;
         sStep *solve(int, tMatrix, QWidget *parent = 0);
 
 private:
+        bool mayNotBeOptimal;
         int nCities;
         sStep *root;
@@ -56 +59 @@
         double align(tMatrix &);
         void cleanup();
-        bool findCandidate(tMatrix, int &, int &, double &);
+        bool findCandidate(tMatrix, int &, int &);
         double findMinInRow(int, tMatrix, int exc = -1);
         double findMinInCol(int, tMatrix, int exr = -1);