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

Timestamp:

Jan 12, 2010, 4:27:52 PM (15 years ago)

Author:

laleppa

Message:

Back to double to maintain compatibility between platforms.

File:

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

trunk/src/tspsolver.cpp

@@ -106 +106 @@
 int nRow, nCol;
 bool firstStep = true;
-qreal check;
+double check;
         while (this->route.size() < nCities) {
 //              forbidden.clear();
@@ -188 +188 @@
 /* Privates **********************************************************/
 
-qreal CTSPSolver::align(TMatrix &matrix)
-{
-qreal r = 0;
-qreal min;
+double CTSPSolver::align(TMatrix &matrix)
+{
+double r = 0;
+double min;
         for (int k = 0; k < nCities; k++) {
                 min = findMinInRow(k,matrix);
@@ -240 +240 @@
 QList<SCandidate> alts;
 SCandidate cand;
-qreal h = -1;
-qreal sum;
+double h = -1;
+double sum;
         for (int r = 0; r < nCities; r++)
                 for (int c = 0; c < nCities; c++)
@@ -261 +261 @@
 }
 
-qreal CTSPSolver::findMinInCol(int nCol, const TMatrix &matrix, int exr) const
-{
-qreal min = INFINITY;
+double CTSPSolver::findMinInCol(int nCol, const TMatrix &matrix, int exr) const
+{
+double min = INFINITY;
         for (int k = 0; k < nCities; k++)
                 if ((k != exr) && (min > matrix.at(k).at(nCol)))
@@ -270 +270 @@
 }
 
-qreal CTSPSolver::findMinInRow(int nRow, const TMatrix &matrix, int exc) const
-{
-qreal min = INFINITY;
+double CTSPSolver::findMinInRow(int nRow, const TMatrix &matrix, int exc) const
+{
+double min = INFINITY;
         for (int k = 0; k < nCities; k++)
                 if (((k != exc)) && (min > matrix.at(nRow).at(k)))
@@ -293 +293 @@
 }
 
-void CTSPSolver::subCol(TMatrix &matrix, int nCol, qreal val)
+void CTSPSolver::subCol(TMatrix &matrix, int nCol, double val)
 {
         for (int k = 0; k < nCities; k++)
@@ -300 +300 @@
 }
 
-void CTSPSolver::subRow(TMatrix &matrix, int nRow, qreal val)
+void CTSPSolver::subRow(TMatrix &matrix, int nRow, double val)
 {
         for (int k = 0; k < nCities; k++)