Changeset c10297cf73 in tspsg for src/tspsolver.cpp
- Timestamp:
- Aug 9, 2009, 1:45:19 AM (15 years ago)
- Branches:
- 0.1.3.145-beta1-symbian, 0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme
- Children:
- 6dfdef0c3e
- Parents:
- 6332a24386
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
src/tspsolver.cpp
r6332a24386 rc10297cf73 39 39 double min = INFINITY; 40 40 for (int k = 0; k < nCities; k++) 41 if (((k != exc)) && (min > matrix [nRow][k]))42 min = matrix [nRow][k];41 if (((k != exc)) && (min > matrix.at(nRow).at(k))) 42 min = matrix.at(nRow).at(k); 43 43 return min == INFINITY ? 0 : min; 44 44 } … … 48 48 double min = INFINITY; 49 49 for (int k = 0; k < nCities; k++) 50 if ((k != exr) && (min > matrix [k][nCol]))51 min = matrix [k][nCol];50 if ((k != exr) && (min > matrix.at(k).at(nCol))) 51 min = matrix.at(k).at(nCol); 52 52 return min == INFINITY ? 0 : min; 53 53 } … … 98 98 for (int c = 0; c < nCities; c++) 99 99 // if ((matrix[r][c] == 0) && !forbidden.values(r).contains(c)) { 100 if (matrix [r][c]== 0) {100 if (matrix.at(r).at(c) == 0) { 101 101 sum = findMinInRow(r,matrix,c) + findMinInCol(c,matrix,r); 102 102 if (sum > h) {
Note: See TracChangeset
for help on using the changeset viewer.