From fd4569b3c5747693ca9384bb00ba4010648da093 Mon Sep 17 00:00:00 2001 From: Larry Date: Fri, 9 Dec 2016 14:48:19 -0600 Subject: [PATCH] fix off by one --- c/greedy/tsp.dSYM/Contents/Info.plist | 20 ++++++++++++++++++ .../tsp.dSYM/Contents/Resources/DWARF/tsp | Bin 0 -> 12529 bytes julia/greedy/greedy.jl | 4 +++- 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 c/greedy/tsp.dSYM/Contents/Info.plist create mode 100644 c/greedy/tsp.dSYM/Contents/Resources/DWARF/tsp diff --git a/c/greedy/tsp.dSYM/Contents/Info.plist b/c/greedy/tsp.dSYM/Contents/Info.plist new file mode 100644 index 0000000..da2e18c --- /dev/null +++ b/c/greedy/tsp.dSYM/Contents/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.tsp + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/c/greedy/tsp.dSYM/Contents/Resources/DWARF/tsp b/c/greedy/tsp.dSYM/Contents/Resources/DWARF/tsp new file mode 100644 index 0000000000000000000000000000000000000000..9e4d8eec5e6a6b7fb7d4baf2149d319be5aa1f90 GIT binary patch literal 12529 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 Rdv-r*yBmj^C|ziC{Rdiq-(LU# literal 0 HcmV?d00001 diff --git a/julia/greedy/greedy.jl b/julia/greedy/greedy.jl index 7d63da8..77ec7af 100644 --- a/julia/greedy/greedy.jl +++ b/julia/greedy/greedy.jl @@ -40,12 +40,14 @@ function tsp(g, n) path = [] count = 0 dist = 0 - for i in 1:n + show = false + for i in 1:n-1 push!(seen, cur) push!(path, cur) count += 1 d, cur = get_nearest_unseen(g[cur][2], seen, count, n) dist += d + show = false end println(dist) println(path)