Changeset 76 in tspsg-svn for trunk/src

Timestamp:

Dec 16, 2009, 11:49:51 PM (15 years ago)

Author:

laleppa

Message:

• TCandidate should, actually, be SCandidate (struct, not typedef). Renamed it.
• Documentation update.

Location:

trunk/src

Files:

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

trunk/src/mainwindow.cpp

@@ -414 +414 @@
                                 output.append("<p>" + trUtf8("Selected candidate for branching: %1.").arg(trUtf8("(%1;%2)").arg(step->candidate.nRow + 1).arg(step->candidate.nCol + 1)) + "</p>");
                                 if (!step->alts.empty()) {
-TCandidate cand;
+SCandidate cand;
 QString alts;
                                         foreach(cand, step->alts) {
@@ -672 +672 @@
                                 line += "<td align=\"center\" class=\"selected\">" + QVariant(step.matrix.at(r).at(c)).toString() + "</td>";
                         else {
-TCandidate cand;
+SCandidate cand;
                                 cand.nRow = r;
                                 cand.nCol = c;

trunk/src/tspsolver.cpp

@@ -227 +227 @@
 }
 
-QList<TCandidate> CTSPSolver::findCandidate(const TMatrix &matrix, int &nRow, int &nCol) const
+QList<SCandidate> CTSPSolver::findCandidate(const TMatrix &matrix, int &nRow, int &nCol) const
 {
         nRow = -1;
         nCol = -1;
-QList<TCandidate> alts;
-TCandidate cand;
+QList<SCandidate> alts;
+SCandidate cand;
 double h = -1;
 double sum;

trunk/src/tspsolver.h

@@ -6 +6 @@
  *  $URL$
  *
- * \brief Defines #tMatrix typedef, sStep struct and CTSPSolver class.
+ * \brief Defines #TMatrix typedef, SCandidate and SStep structs and CTSPSolver class.
  *
  *  <b>TSPSG: TSP Solver and Generator</b>
@@ -39 +39 @@
  * \brief A structure that represents a candidate for branching.
  */
-struct TCandidate {
+struct SCandidate {
         int nRow; //!< A zero-based row number of the candidate
         int nCol; //!< A zero-based column number of the candidate
 
         //! Assigns default values
-        TCandidate() {
+        SCandidate() {
                 nCol = nRow = -1;
         }
         //! An operator == implementation
-        bool operator ==(const TCandidate &cand) const {
+        bool operator ==(const SCandidate &cand) const {
                 return ((cand.nRow == nRow) && (cand.nCol == nCol));
         }
@@ -61 +61 @@
         TMatrix matrix; //!< This step's matrix
         double price; //!< The price of travel to this step
-        TCandidate candidate; //!< A candiadate for branching in the current matrix
-        QList<TCandidate> alts; //!< A list of alternative branching candidates
+        SCandidate candidate; //!< A candiadate for branching in the current matrix
+        QList<SCandidate> alts; //!< A list of alternative branching candidates
         SStep *plNode; //!< Pointer to the left branch step
         SStep *prNode; //!< Pointer to the right branch step
@@ -101 +101 @@
         void cleanup();
         void deleteNode(SStep *node);
-        QList<TCandidate> findCandidate(const TMatrix &matrix, int &nRow, int &nCol) const;
+        QList<SCandidate> findCandidate(const TMatrix &matrix, int &nRow, int &nCol) const;
         double findMinInCol(int nCol, const TMatrix &matrix, int exr = -1) const;
         double findMinInRow(int nRow, const TMatrix &matrix, int exc = -1) const;