Changeset 278bc7818f in tspsg for src/tspmodel.cpp

Timestamp:

Feb 27, 2010, 2:13:50 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:

162d5c5f94

Parents:

b2bf8e3b6b

Message:

+ Added Symmetric mode: in this mode the cost of travel from city 1 to city 2 and vice versa is the same.
+ Added the ability to reset all settings to their defaults: hold Shift while clicking Save button in Settings Dialog.

• Better SIP show/hide handling under wince: no need to resize the Main Window, when it isn't active.

File:

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

src/tspmodel.cpp

@@ -191 +191 @@
 void CTSPModel::randomize()
 {
-int randMin = settings->value("Task/RandMin",DEF_RAND_MIN).toInt();
-int randMax = settings->value("Task/RandMax",DEF_RAND_MAX).toInt();
-        for (int r = 0; r < nCities; r++)
-                for (int c = 0; c < nCities; c++)
-                        if (r != c)
-                                table[r][c] = rand(randMin,randMax);
-        emit dataChanged(index(0,0),index(nCities - 1,nCities - 1));
+int randMin = settings->value("Task/RandMin", DEF_RAND_MIN).toInt();
+int randMax = settings->value("Task/RandMax", DEF_RAND_MAX).toInt();
+        if (settings->value("Task/SymmetricMode", DEF_SYMMETRIC_MODE).toBool()) {
+                for (int r = 0; r < nCities; r++)
+                        for (int c = 0; c < r; c++)
+                                table[c][r] = table[r][c] = rand(randMin, randMax);
+        } else {
+                for (int r = 0; r < nCities; r++)
+                        for (int c = 0; c < nCities; c++)
+                                if (r != c)
+                                        table[r][c] = rand(randMin, randMax);
+        }
+        emit dataChanged(index(0,0), index(nCities - 1, nCities - 1));
 }
 
@@ -315 +321 @@
                         if (!ok || tmp < 0)
                                 return false;
-                        else
+                        else {
                                 table[index.row()][index.column()] = tmp;
+                                if (settings->value("Task/SymmetricMode", DEF_SYMMETRIC_MODE).toBool())
+                                        table[index.column()][index.row()] = tmp;
+                        }
                 }
                 emit dataChanged(index,index);