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

Timestamp:

Jan 12, 2010, 3:11:24 PM (15 years ago)

Author:

laleppa

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:

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

trunk/src/tspsolver.cpp

@@ -1 +1 @@
 /*
  *  TSPSG: TSP Solver and Generator
- *  Copyright (C) 2007-2009 Lёppa <contacts[at]oleksii[dot]name>
+ *  Copyright (C) 2007-2010 Lёppa <contacts[at]oleksii[dot]name>
  *
  *  $Id$
@@ -40 +40 @@
 
 int i = 0; // We start from City 1
-QString path = trUtf8("City %1").arg(1) + " -> ";
+QString path = tr("City %1").arg(1) + " -> ";
         while ((i = route[i]) != 0) {
-                path += trUtf8("City %1").arg(i + 1) + " -> ";
+                path += tr("City %1").arg(i + 1) + " -> ";
         }
         // And finish in City 1, too
-        path += trUtf8("City %1").arg(1);
+        path += tr("City %1").arg(1);
 
         return path;
@@ -89 +89 @@
 QProgressBar *pb = new QProgressBar(&pd);
         pb->setAlignment(Qt::AlignCenter);
-        pb->setFormat(trUtf8("%v of %m parts found"));
+        pb->setFormat(tr("%v of %m parts found"));
         pd.setBar(pb);
         pd.setMaximum(nCities);
         pd.setMinimumDuration(1000);
-        pd.setLabelText(trUtf8("Calculating optimal route..."));
-        pd.setWindowTitle(trUtf8("Solution Progress"));
+        pd.setLabelText(tr("Calculating optimal route..."));
+        pd.setWindowTitle(tr("Solution Progress"));
         pd.setWindowModality(Qt::ApplicationModal);
         pd.setValue(0);
@@ -106 +106 @@
 int nRow, nCol;
 bool firstStep = true;
-double check;
+qreal check;
         while (this->route.size() < nCities) {
 //              forbidden.clear();
@@ -168 +168 @@
         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();
+                QMessageBox(QMessageBox::Warning,tr("Solution Result"),tr("Unable to find solution.\nMaybe, this task has no solutions."),QMessageBox::Ok,parent).exec();
         }
 
@@ -188 +188 @@
 /* Privates **********************************************************/
 
-double CTSPSolver::align(TMatrix &matrix)
-{
-double r = 0;
-double min;
+qreal CTSPSolver::align(TMatrix &matrix)
+{
+qreal r = 0;
+qreal min;
         for (int k = 0; k < nCities; k++) {
                 min = findMinInRow(k,matrix);
@@ -240 +240 @@
 QList<SCandidate> alts;
 SCandidate cand;
-double h = -1;
-double sum;
+qreal h = -1;
+qreal sum;
         for (int r = 0; r < nCities; r++)
                 for (int c = 0; c < nCities; c++)
@@ -261 +261 @@
 }
 
-double CTSPSolver::findMinInCol(int nCol, const TMatrix &matrix, int exr) const
-{
-double min = INFINITY;
+qreal CTSPSolver::findMinInCol(int nCol, const TMatrix &matrix, int exr) const
+{
+qreal min = INFINITY;
         for (int k = 0; k < nCities; k++)
                 if ((k != exr) && (min > matrix.at(k).at(nCol)))
@@ -270 +270 @@
 }
 
-double CTSPSolver::findMinInRow(int nRow, const TMatrix &matrix, int exc) const
-{
-double min = INFINITY;
+qreal CTSPSolver::findMinInRow(int nRow, const TMatrix &matrix, int exc) const
+{
+qreal 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, double val)
+void CTSPSolver::subCol(TMatrix &matrix, int nCol, qreal val)
 {
         for (int k = 0; k < nCities; k++)
@@ -300 +300 @@
 }
 
-void CTSPSolver::subRow(TMatrix &matrix, int nRow, double val)
+void CTSPSolver::subRow(TMatrix &matrix, int nRow, qreal val)
 {
         for (int k = 0; k < nCities; k++)