From 477daab27e4172d46de1eb49de3f19f3e308eac5 Mon Sep 17 00:00:00 2001 From: Ian Caffey Date: Thu, 8 Dec 2016 17:10:33 -0600 Subject: [PATCH] Switched to using destructuring syntax. --- kotlin/greedy/TravelingSalesman.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kotlin/greedy/TravelingSalesman.kt b/kotlin/greedy/TravelingSalesman.kt index 2d387ea..2fbee3e 100644 --- a/kotlin/greedy/TravelingSalesman.kt +++ b/kotlin/greedy/TravelingSalesman.kt @@ -32,10 +32,10 @@ fun solve(nodes: List>) { 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) }