Switched to using destructuring syntax.

rellermeyer · Dec 8, 2016 · 477daab · 477daab
1 parent d17e127
commit 477daab
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/kotlin/greedy/TravelingSalesman.kt b/kotlin/greedy/TravelingSalesman.kt
@@ -32,10 +32,10 @@ fun solve(nodes: List<Triple<Int, Int, Int>>) {
     path.add(start)
     unvisited.remove(start) //prune start to manually create path from last node to start
     while (unvisited.isNotEmpty()) {
-        val nearest = nearest(path.last(), unvisited)
-        distance += nearest.first
-        path.add(nearest.second)
-        unvisited.remove(nearest.second)
+        val (nearestDistance, nearest) = nearest(path.last(), unvisited)
+        distance += nearestDistance
+        path.add(nearest)
+        unvisited.remove(nearest)
     }
     println("Distance: " + (distance + distance(start, path.last())))
     path.forEach { println(it.first) }