Changeset e4ae9e95f7 in tspsg for src/tspmodel.cpp

Timestamp:

Jan 12, 2010, 4:27:52 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:

3e46075789

Parents:

fcd8c1e4c1

Message:

Back to double to maintain compatibility between platforms.

File:

• src/tspmodel.cpp (modified) (5 diffs)

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;
 }