Changeset 394216e468 in tspsg for src/tspsolver.h

Timestamp:

Mar 22, 2010, 9:45:16 PM (14 years ago)

Author:

Oleksii Serdiuk

Branches:

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

Children:

1babbd6ba3

Parents:

e2abfd326f

Message:

• Fixed a bug when a solution couldn't be found for some tasks while the task had at least one solution (mostly, tasks with a lot of restrictions).
• Fixed a bug when Save As dialog always appeared (even for non-Untitled files) when selecting Save in Unsaved Changes dialog.
• Improved the solution algorithm.
• Moved progress dialog from CTSPSolver to MainWindow?. CTSPSolver doesn't contain any GUI related code now.

+ Added routePartFound() signal to CTSPSolver which is emitted once every time a part of the route is found.
+ Added cancel() slot and wasCanceled() public function to CTSPSolver to be able to cancel a solution process and to know whether it was canceled.
+ Progress is now shown when generating a solution output.
+ Check for updates functionality (only in Windows version at this moment).

File:

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

src/tspsolver.h

@@ -78 +78 @@
  * \author Copyright &copy; 2007-2010 Lёppa <contacts[at]oleksii[dot]name>
  */
-class CTSPSolver
+class CTSPSolver: public QObject
 {
-        Q_DECLARE_TR_FUNCTIONS(CTSPSolver)
+        Q_OBJECT
 
 public:
-        CTSPSolver();
+        static QString getVersionId();
+
+        CTSPSolver(QObject *parent = NULL);
+        void cleanup(bool processEvents = false);
         QString getSortedPath() const;
-        static QString getVersionId();
         bool isOptimal() const;
-        SStep *solve(int numCities, TMatrix task, QWidget *parent = 0);
+        SStep *solve(int numCities, const TMatrix &task);
+        bool wasCanceled() const;
         ~CTSPSolver();
 
+public slots:
+        void cancel();
+
+signals:
+        /*!
+         * \brief This signal is emitted once every time a part of the route is found.
+         * \param n Indicates the number of the route parts found.
+         */
+        void routePartFound(int n);
+
 private:
-        bool mayNotBeOptimal;
+        bool mayNotBeOptimal, canceled;
         int nCities;
         SStep *root;
         QHash<int,int> route;
-//      QHash<int,int> forbidden;
+        mutable QMutex mutex;
 
         double align(TMatrix &matrix);
-        void cleanup();
-        void deleteTree(SStep *&root);
+        void deleteTree(SStep *&root, bool processEvents = false);
+        void denormalize(TMatrix &matrix) const;
         QList<SCandidate> findCandidate(const TMatrix &matrix, int &nRow, int &nCol) const;
         double findMinInCol(int nCol, const TMatrix &matrix, int exr = -1) const;
         double findMinInRow(int nRow, const TMatrix &matrix, int exc = -1) const;
         bool hasSubCycles(int nRow, int nCol) const;
+        void normalize(TMatrix &matrix) const;
         void subCol(TMatrix &matrix, int nCol, double val);
         void subRow(TMatrix &matrix, int nRow, double val);
@@ -110 +124 @@
 #ifdef DEBUG
 QDebug operator<<(QDebug dbg, const TMatrix &matrix);
-#endif
+QDebug operator<<(QDebug dbg, const SCandidate &candidate);
+#endif // DEBUG
 
 #endif // TSPSOLVER_H