Changeset 89 in tspsg-svn for trunk

Timestamp:

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

Author:

laleppa

Message:

Back to double to maintain compatibility between platforms.

Location:

trunk

Files:

• i18n/ru.ts (modified) (4 diffs)
• i18n/uk.ts (modified) (3 diffs)
• src/globals.h (modified) (1 diff)
• src/mainwindow.cpp (modified) (2 diffs)
• src/tspmodel.cpp (modified) (5 diffs)
• src/tspmodel.h (modified) (1 diff)
• src/tspsolver.cpp (modified) (7 diffs)
• src/tspsolver.h (modified) (3 diffs)

trunk/i18n/ru.ts

@@ -737 +737 @@
         <location filename="../ui/settingsdialog.ui" line="456"/>
         <source>Output font settings</source>
-        <translation>Параметры шрифта вывода</translation>
+        <translation>Параметры шрифта</translation>
     </message>
     <message>
@@ -757 +757 @@
         <location filename="../ui/settingsdialog.ui" line="162"/>
         <source>General TSPSG settings</source>
-        <translation>ОБщие настройки TSPSG</translation>
+        <translation>Общие настройки TSPSG</translation>
     </message>
     <message>
@@ -770 +770 @@
     </message>
     <message>
-        <source>Random</source>
-        <translation type="obsolete">Случайные</translation>
-    </message>
-    <message>
-        <source>Random number generation settings</source>
-        <translation type="obsolete">Настройки генерации случайных чисел</translation>
-    </message>
-    <message>
         <location filename="../ui/settingsdialog.ui" line="357"/>
         <source>Output</source>
@@ -816 +808 @@
         <source>Font color for solution output</source>
         <translation>Цвет шрифта, используемого при выводе</translation>
-    </message>
-    <message>
-        <source>Generate fractional random values with the accuracy of 2 decimal places</source>
-        <translation type="obsolete">Генерировать дробные случайные числа с точностью до 2-о знака</translation>
     </message>
     <message>

trunk/i18n/uk.ts

@@ -753 +753 @@
         <location filename="../ui/settingsdialog.ui" line="456"/>
         <source>Output font settings</source>
-        <translation>Параметри шрифта виводу</translation>
+        <translation>Параметри шрифта</translation>
     </message>
     <message>
@@ -786 +786 @@
     </message>
     <message>
-        <source>Random</source>
-        <translation type="obsolete">Випадкові</translation>
-    </message>
-    <message>
-        <source>Random number generation settings</source>
-        <translation type="obsolete">Налаштування генерації випадкових чисел</translation>
-    </message>
-    <message>
         <location filename="../ui/settingsdialog.ui" line="357"/>
         <source>Output</source>
@@ -832 +824 @@
         <source>Font color for solution output</source>
         <translation>Колір шрифта для виводу</translation>
-    </message>
-    <message>
-        <source>Generate fractional random values with the accuracy of 2 decimal places</source>
-        <translation type="obsolete">Генерувати дробові випадкові числа з точністю до 2-го знаку</translation>
     </message>
     <message>

trunk/src/globals.h

@@ -96 +96 @@
  * \return \c true if \a x countains an integer, oherwise \c false.
  */
-inline bool isInteger(qreal x)
+inline bool isInteger(double x)
 {
-qreal i;
+double i;
         return (modf(x, &i) == 0.0);
 }

trunk/src/mainwindow.cpp

@@ -383 +383 @@
 {
 TMatrix matrix;
-QList<qreal> row;
+QList<double> row;
 int n = spinCities->value();
 bool ok;
@@ -389 +389 @@
                 row.clear();
                 for (int c = 0; c < n; c++) {
-                        row.append(tspmodel->index(r,c).data(Qt::UserRole).toReal(&ok));
+                        row.append(tspmodel->index(r,c).data(Qt::UserRole).toDouble(&ok));
                         if (!ok) {
                                 QMessageBox(QMessageBox::Critical,tr("Data error"),tr("Error in cell [Row %1; Column %2]: Invalid data format.").arg(r + 1).arg(c + 1),QMessageBox::Ok,this).exec();

trunk/src/tspmodel.cpp

@@ -281 +281 @@
                 for (int c = 0; c < nCities; c++)
                         if (r != c) {
-                                ds << static_cast<double>(table[r][c]); // We cast to double because qreal may be float on some platforms and we store double values in file
+                                ds << static_cast<double>(table[r][c]); // We cast to double because double may be float on some platforms and we store double values in file
                                 if (f.error() != QFile::NoError) {
                                         f.close();
@@ -312 +312 @@
                 else {
 bool ok;
-qreal tmp = value.toReal(&ok);
+double tmp = value.toDouble(&ok);
                         if (!ok || tmp < 0)
                                 return false;
@@ -399 +399 @@
         }
 
-double x; // We need this as qreal may be float on some platforms and we store double values in file
+double x; // We need this as double may be float on some platforms and we store double values in file
         // Travel costs
         for (int r = 0; r < size; r++)
@@ -447 +447 @@
         }
         // Travel costs
-qreal val;
+double val;
         for (int r = 0; r < 5; r++)
                 for (int c = 0; c < 5; c++)
@@ -469 +469 @@
 }
 
-inline qreal CTSPModel::rand(int min, int max) const
-{
-qreal r;
+inline double CTSPModel::rand(int min, int max) const
+{
+double r;
         if (settings->value("Task/FractionalRandom", DEF_FRACTIONAL_RANDOM).toBool()) {
-qreal x = qPow(10, settings->value("Task/FractionalAccuracy", DEF_FRACTIONAL_ACCURACY).toInt());
-                r = (qreal)qRound((qreal)qrand() / RAND_MAX * (max - min) * x) / x;
+double x = qPow(10, settings->value("Task/FractionalAccuracy", DEF_FRACTIONAL_ACCURACY).toInt());
+                r = (double)qRound((double)qrand() / RAND_MAX * (max - min) * x) / x;
         } else
-                r = qRound((qreal)qrand() / RAND_MAX * (max - min));
+                r = qRound((double)qrand() / RAND_MAX * (max - min));
         return min + r;
 }

trunk/src/tspmodel.h

@@ -64 +64 @@
 private:
         QSettings *settings;
-        QVector<QVector<qreal> > table;
+        QVector<QVector<double> > table;
         quint16 nCities;
         bool loadError(QDataStream::Status);
         bool loadTSPT(QDataStream *);
         bool loadZKT(QDataStream *);
-        qreal rand(int, int) const;
+        double rand(int, int) const;
 };
 

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++)

trunk/src/tspsolver.h

@@ -34 +34 @@
 
 //! A matrix of city-to-city travel costs.
-typedef QList<QList<qreal> > TMatrix;
+typedef QList<QList<double> > TMatrix;
 
 /*!
@@ -60 +60 @@
 struct SStep {
         TMatrix matrix; //!< This step's matrix
-        qreal price; //!< The price of travel to this step
+        double 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
@@ -98 +98 @@
 //      QHash<int,int> forbidden;
 
-        qreal align(TMatrix &matrix);
+        double align(TMatrix &matrix);
         void cleanup();
         void deleteNode(SStep *&node);
         QList<SCandidate> findCandidate(const TMatrix &matrix, int &nRow, int &nCol) const;
-        qreal findMinInCol(int nCol, const TMatrix &matrix, int exr = -1) const;
-        qreal findMinInRow(int nRow, const TMatrix &matrix, int exc = -1) 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 subCol(TMatrix &matrix, int nCol, qreal val);
-        void subRow(TMatrix &matrix, int nRow, qreal val);
+        void subCol(TMatrix &matrix, int nCol, double val);
+        void subRow(TMatrix &matrix, int nRow, double val);
 };