Changeset 110 in tspsg-svn for trunk/src

Timestamp:

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

Author:

laleppa

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.

Location:

trunk/src

Files:

• mainwindow.cpp (modified) (2 diffs)
• tspsolver.cpp (modified) (2 diffs)
• tspsolver.h (modified) (1 diff)
• version.h (modified) (1 diff)

trunk/src/mainwindow.cpp

@@ -666 +666 @@
 
         cur.insertBlock(fmt_paragraph);
-        cur.insertText("  " + solver.getSortedPath());
+        cur.insertText("  " + solver.getSortedPath(tr("City %1")));
 
         cur.insertBlock(fmt_paragraph);
@@ -861 +861 @@
                 pic.drawLine(QPointF(x, y - r), QPointF(r * 2.25, y - 2 * r));
         } else if (nstep > 1) {
-                pic.drawLine(QPointF(x, y - r), QPointF((step->pNode->next == SStep::RightBranch) ? r * 3.5 : r, y - 2 * r));
+                pic.drawLine(QPointF(x, y - r), QPointF((step->pNode->pNode->next == SStep::RightBranch) ? r * 3.5 : r, y - 2 * r));
         }
 

trunk/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);
 }
 

trunk/src/tspsolver.h

@@ -113 +113 @@
         CTSPSolver(QObject *parent = NULL);
         void cleanup(bool processEvents = false);
-        QString getSortedPath() const;
+        QString getSortedPath(const QString &city, const QString &separator = " -> ") const;
         int getTotalSteps() const;
         bool isOptimal() const;

trunk/src/version.h

@@ -11 +11 @@
  *
  *  This file is part of TSPSG.
- *
- *  TSPSG is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  TSPSG is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with TSPSG.  If not, see <http://www.gnu.org/licenses/>.
- */
-/*!
- * \mainpage
- * \image html tspsg.png
- *  <b>TSPSG: TSP Solver and Generator</b>
- * \author Copyright &copy; 2007-2010 Lёppa <contacts[at]oleksii[dot]name>
- *
- *  \b Homepage: <a href="http://tspsg.sourceforge.net/">tspsg.sourceforge.net</a>
  *
  *  TSPSG is free software: you can redistribute it and/or modify