Changeset 42 in tspsg-svn for trunk/src/tspmodel.cpp

Timestamp:

Jul 31, 2009, 8:23:07 PM (15 years ago)

Author:

laleppa

Message:

+ Finished solving algorithm (needs thorough testing).
+ Solution can be saved to HTML or OpenDocument? format.
+ Added VERSIONINFO resource for windows builds.

• Updated translations to have unified terminology everywhere.

NB: This will be the first public alpha build.

File:

• trunk/src/tspmodel.cpp (modified) (4 diffs)

trunk/src/tspmodel.cpp

@@ -1 +1 @@
 /*
- *  TSPSG - TSP Solver and Generator
+ *  TSPSG: TSP Solver and Generator
  *  Copyright (C) 2007-2009 Lёppa <contacts[at]oleksii[dot]name>
  *
@@ -119 +119 @@
                 return;
         emit layoutAboutToBeChanged();
-        if (n > nCities) {
-                for (int r = 0; r < nCities; r++) {
-                        for (int c = nCities; c < n; c++)
-                                if (r == c)
-                                        table[r][c] = INFINITY;
-                                else
-                                        table[r][c] = 0;
-                }
-                for (int r = nCities; r < n; r++) {
-                        for (int c = 0; c < n; c++)
-                                if (r == c)
-                                        table[r][c] = INFINITY;
-                                else
-                                        table[r][c] = 0;
-                }
-        }
+        table.resize(n);
+        for (int k = 0; k < n; k++) {
+                table[k].resize(n);
+        }
+        if (n > nCities)
+                for (int k = nCities; k < n; k++)
+                        table[k][k] = INFINITY;
         nCities = n;
         emit layoutChanged();
@@ -148 +139 @@
 }
 
-inline bool CTSPModel::loadError(QDataStream::Status status) const
+inline bool CTSPModel::loadError(QDataStream::Status status)
 {
 QString err;
@@ -257 +248 @@
         // Costs
 double val;
-        for (int r = 0; r < size; r++)
-                for (int c = 0; c < size; c++)
-                        if (r != c) {
+        for (int r = 0; r < 5; r++)
+                for (int c = 0; c < 5; c++)
+                        if ((r != c) && (r < size)) {
                                 ds->readRawData(reinterpret_cast<char *>(&val),8);
                                 if (loadError(ds->status())) {