using TSPLIB

Project.toml

@@ -6,7 +6,9 @@ version = "0.1.0"
 [deps]
 Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
+TSPLIB = "b1c258e7-59ae-4b06-a547-f10871db1548"
 
 [compat]
 julia = "1"

deps/build.jl

@@ -1,5 +1,8 @@
 import Libdl
 
+import Pkg
+Pkg.add(url="https://github.com/matago/TSPLIB.jl")
+
 const QSOPT_LOCATION = Dict(
     "Darwin" => [
         "https://www.math.uwaterloo.ca/~bico/qsopt/beta/codes/mac64/qsopt.a",

src/Concorde.jl

@@ -1,6 +1,7 @@
 module Concorde
 
 using Random, LinearAlgebra
+using TSPLIB
 
 include("../deps/deps.jl")
 include("dist.jl")
@@ -29,7 +30,7 @@ end
 
 
 function cleanup(name)
-    exts = ["mas", "pul", "sav", "sol", "tsp"]
+    exts = ["mas", "pul", "sav", "sol", "tsp", "res"]
     for ext in exts
         file =  "$(name).$(ext)"
         rm(file, force=true)
@@ -142,8 +143,12 @@ function solve_tsp(tsp_file::String)
 
     sol_filepath =  name * ".sol"
     opt_tour = read_solution(sol_filepath)
-    opt_len = - 1 # Need to implement the calculation of the obj function
+    # opt_len = - 1 # Need to implement the calculation of the obj function
 
+    tsp = TSPLIB.readTSP(filepath)
+    M = Int.(tsp.weights)
+    opt_len = tour_length(opt_tour, M)
+
     cleanup(name)
 
     return opt_tour, opt_len

test/runtests.jl

@@ -36,7 +36,7 @@ using Test
 
     @testset "Input File" begin
         opt_tour, opt_len = solve_tsp("gr17.tsp")
-        @test opt_len == -1
-        # @test opt_len == 2085
+        # @test opt_len == -1
+        @test opt_len == 2085
     end    
 end