Changeset 1757eb594b in tspsg for src/tspsolver.h

Timestamp:

Jan 12, 2010, 3:11:24 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:

fcd8c1e4c1

Parents:

64f288c0f8

Message:

+ Added Fractional accuracy (in decimail places) to settings.
+ Created defaults.h file. Moved all default defines there.

• Replaced all double types with qreal.
• Replaced all calls to trUtf8() with tr() as we use setCodecForTr() to set UTF-8 encoding as default and tr() is enough.
• Replaced all 2009 with 2010 in copyrights.
• Fixed an error when loading .zkt file with less than 5 cities.

File:

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

src/tspsolver.h

@@ -1 +1 @@
 /*!
  * \file tspsolver.h
- * \author Copyright &copy; 2007-2009 Lёppa <contacts[at]oleksii[dot]name>
+ * \author Copyright &copy; 2007-2010 Lёppa <contacts[at]oleksii[dot]name>
  *
  *  $Id$
@@ -34 +34 @@
 
 //! A matrix of city-to-city travel costs.
-typedef QList<QList<double> > TMatrix;
+typedef QList<QList<qreal> > TMatrix;
 
 /*!
@@ -60 +60 @@
 struct SStep {
         TMatrix matrix; //!< This step's matrix
-        double price; //!< The price of travel to this step
+        qreal price; //!< The price of travel to this step
         SCandidate candidate; //!< A candiadate for branching in the current matrix
         QList<SCandidate> alts; //!< A list of alternative branching candidates
@@ -75 +75 @@
 /*!
  * \brief This class solves Travelling Salesman Problem task.
- * \author Copyright &copy; 2007-2009 Lёppa <contacts[at]oleksii[dot]name>
+ * \author Copyright &copy; 2007-2010 Lёppa <contacts[at]oleksii[dot]name>
  *
  * \todo TODO: Deletion of solution tree on destroy and cleanup.
@@ -98 +98 @@
 //      QHash<int,int> forbidden;
 
-        double align(TMatrix &matrix);
+        qreal align(TMatrix &matrix);
         void cleanup();
         void deleteNode(SStep *&node);
         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;
+        qreal findMinInCol(int nCol, const TMatrix &matrix, int exr = -1) const;
+        qreal findMinInRow(int nRow, const TMatrix &matrix, int exc = -1) const;
         bool hasSubCycles(int nRow, int nCol) const;
-        void subCol(TMatrix &matrix, int nCol, double val);
-        void subRow(TMatrix &matrix, int nRow, double val);
+        void subCol(TMatrix &matrix, int nCol, qreal val);
+        void subRow(TMatrix &matrix, int nRow, qreal val);
 };