Changeset 5d401f2c50 in tspsg for src/tspsolver.cpp

Timestamp:

Apr 28, 2010, 1:38:10 AM (15 years ago)

Author:

Oleksii Serdiuk

Branches:

0.1.3.145-beta1-symbian, 0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme

Children:

f2ff738751

Parents:

20015b41e7

git-author:

Oleksii Serdiuk <contacts@…> (04/28/10 01:38:10)

git-committer:

Oleksii Serdiuk <contacts@…> (06/29/12 19:41:31)

Message:

+ Added ChangeLog?, Installation Guide and License pages to doxygen generated documentation.

• Added city and separator parameters to CTSPSolver::getSortedPath() method to make path generation more flexible.
• Fixed a bug when the solution graph wasn't drwan correctly in some situations.

File:

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

src/tspsolver.cpp

@@ -71 +71 @@
 /*!
  * \brief Returns the sorted optimal path, starting from City 1.
+ * \param city A string that represents city elements in the path.
+ * \param separator A string that represents separators between cities in the path.
  * \return A string, containing sorted optimal path.
- */
-QString CTSPSolver::getSortedPath() const
+ *
+ *  The resulting path will be in the form \a city+\a separator+\a city+...+\a separator+\a city.
+ *  \c \%1 in \a city will be replaced by the city number.
+ */
+QString CTSPSolver::getSortedPath(const QString &city, const QString &separator) const
 {
         if (!root || route.isEmpty() || (route.size() != nCities))
@@ -79 +84 @@
 
 int i = 0; // We start from City 1
-QString path = tr("City %1").arg(1) + " -> ";
+QStringList path;
+        path << city.arg(1);
         while ((i = route[i]) != 0) {
-                path += tr("City %1").arg(i + 1) + " -> ";
+                path << city.arg(i + 1);
         }
         // And finish in City 1, too
-        path += tr("City %1").arg(1);
-
-        return path;
+        path << city.arg(1);
+
+        return path.join(separator);
 }