diff --git a/Project.toml b/Project.toml index 2be558b..f218272 100644 --- a/Project.toml +++ b/Project.toml @@ -2,7 +2,7 @@ name = "Seleroute" uuid = "d2f42c57-c897-4e08-8218-a119b5759c84" authors = ["Thibaut Cuvelier "] repo = "https://github.com/dourouc05/Seleroute.jl.git" -version = "0.2.0" +version = "0.2.1" [deps] Cairo = "159f3aea-2a34-519c-b102-8c37f9878175" diff --git a/src/compute/certain/certain_cg.jl b/src/compute/certain/certain_cg.jl index 0d9c076..6569c0d 100644 --- a/src/compute/certain/certain_cg.jl +++ b/src/compute/certain/certain_cg.jl @@ -97,7 +97,7 @@ function _mintotload_solve_pricing_problem_master(rd::RoutingData, end # Compute the shortest path for this demand. - state = desopo_pape_shortest_paths(rd.g, src(demand), weight_matrix) + state = dijkstra_shortest_paths(rd.g, src(demand), weight_matrix) # Is there a solution? Has this path a negative reduced cost? if all(state.parents .== 0) @@ -218,7 +218,7 @@ function _minmaxload_solve_pricing_problem_master(rd::RoutingData, end # Compute the shortest path for this demand. - state = desopo_pape_shortest_paths(rd.g, src(demand), weight_matrix) + state = dijkstra_shortest_paths(rd.g, src(demand), weight_matrix) # Is there a solution? Has this path a negative reduced cost? if all(state.parents .== 0) diff --git a/src/compute/certain/mmf.jl b/src/compute/certain/mmf.jl index e73830c..9c51b13 100644 --- a/src/compute/certain/mmf.jl +++ b/src/compute/certain/mmf.jl @@ -211,7 +211,7 @@ function _mmf_solve_pricing_problem(rd::RoutingData, dual_values_capacity, dual_ rd.logmessage("Pricing for $demand") # Compute the shortest path for this demand. - state = desopo_pape_shortest_paths(rd.g, src(demand), weight_matrix) + state = dijkstra_shortest_paths(rd.g, src(demand), weight_matrix) # Is there a solution? Has this path a negative reduced cost? if all(state.parents .== 0) diff --git a/src/compute/oblivious/iter_pathcg.jl b/src/compute/oblivious/iter_pathcg.jl index 20a7c24..2dc8b9c 100644 --- a/src/compute/oblivious/iter_pathcg.jl +++ b/src/compute/oblivious/iter_pathcg.jl @@ -56,7 +56,7 @@ function _oblivious_iterative_solve_pricing_problem_master(rd::RoutingData, end # Compute the shortest path for this demand. - state = desopo_pape_shortest_paths(rd.g, src(demand), weight_matrix) + state = dijkstra_shortest_paths(rd.g, src(demand), weight_matrix) # Is there a solution? Has this path a negative reduced cost? if all(state.parents .== 0) @@ -102,7 +102,7 @@ function _oblivious_iterative_solve_pricing_problem_subproblem(rd::RoutingData, # Perform the actual pricing. for demand in demands(rd) # Compute the shortest path for this demand. - state = desopo_pape_shortest_paths(rd.g, src(demand), weight_matrix) + state = dijkstra_shortest_paths(rd.g, src(demand), weight_matrix) # Is there a solution? Has this path a negative reduced cost? if all(state.parents .== 0) diff --git a/src/compute/oblivious/rr_pathcg.jl b/src/compute/oblivious/rr_pathcg.jl index 425b127..a6cc1a9 100644 --- a/src/compute/oblivious/rr_pathcg.jl +++ b/src/compute/oblivious/rr_pathcg.jl @@ -123,7 +123,7 @@ function _oblivious_reformulation_solve_pricing_problem(rd::RoutingData, dual_va end # Compute the shortest path for this demand. - state = desopo_pape_shortest_paths(rd.g, src(demand), weight_matrix) + state = dijkstra_shortest_paths(rd.g, src(demand), weight_matrix) # Is there a solution? Has this path a negative reduced cost? if all(state.parents .== 0) diff --git a/src/data/solution.jl b/src/data/solution.jl index 3354fdb..4387e77 100644 --- a/src/data/solution.jl +++ b/src/data/solution.jl @@ -224,7 +224,7 @@ function flow_routing_to_path(data::RoutingData, routing::AbstractMatrix{Float64 weight_e(e) = get_prop(ug, e, :weight) while ne(ug) > 0 # Get a path arbitrarily (easiest to compute: shortest one) - sp = desopo_pape_shortest_paths(ug, src(d)) + sp = dijkstra_shortest_paths(ug, src(d)) path_vertices = enumerate_paths(sp, dst(d)) path = map(Edge, zip(path_vertices[1:end-1], path_vertices[2:end])) if length(path) == 0