Fix tour cost calculation

- last column of distance matrix was stored incorrectly/overridden
- cost of return to depot at the end of the tour added