From 7db6d7afd7bf0c8c984721f65df825e7097b4b49 Mon Sep 17 00:00:00 2001 From: Changhyun Kwon Date: Mon, 15 May 2017 08:20:29 -0400 Subject: [PATCH] TNTP SHA specified --- src/TrafficAssignment.jl | 3 +++ src/load_network.jl | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/TrafficAssignment.jl b/src/TrafficAssignment.jl index a28c438..b10aad5 100644 --- a/src/TrafficAssignment.jl +++ b/src/TrafficAssignment.jl @@ -4,6 +4,9 @@ module TrafficAssignment using LightGraphs, Optim, BinDeps +TNTP_SHA = "ca933f74c03af688dfffa33f4b00826cba672479" + + include("load_network.jl") include("frank_wolfe.jl") diff --git a/src/load_network.jl b/src/load_network.jl index 6551490..e8e3965 100644 --- a/src/load_network.jl +++ b/src/load_network.jl @@ -39,7 +39,7 @@ end function download_tntp(force_download=false) ta_root_dir = joinpath(dirname(dirname(@__FILE__))) dest = ta_root_dir - data_dir = joinpath(dest, "TransportationNetworks-master") + data_dir = joinpath(dest, "TransportationNetworks-$(TNTP_SHA)") # Download @@ -48,7 +48,7 @@ function download_tntp(force_download=false) rm(data_dir) end file = joinpath(ta_root_dir, "tntp.zip") - dl = download("https://github.com/bstabler/TransportationNetworks/archive/master.zip", file) + dl = download("https://github.com/bstabler/TransportationNetworks/archive/$(TNTP_SHA).zip", file) run(unpack_cmd(file, dest, ".zip", "")) rm(file) end