diff --git a/src/jl/MCP_heuristics.jl b/src/jl/MCP_heuristics.jl index be9d71b6a1ec506c5c27528e8b364f94fe7412f0..c9c569c13809d4bb6aa87715e04fa029dfbcc8f2 100644 --- a/src/jl/MCP_heuristics.jl +++ b/src/jl/MCP_heuristics.jl @@ -372,7 +372,9 @@ function threshold_greedy_algorithm(D::Array{Float64,2}, c::Float64, n::Float64) obj_incumbent = obj_candidate locations_added += 1 end - x_incumbent = zeros(Float64, L) x_incumbent[ind_ones_incumbent] .= 1. return x_incumbent, obj_incumbent + x_incumbent = zeros(Float64, L) + x_incumbent[ind_incumbent] .= 1. + return x_incumbent, obj_incumbent end function time_threshold_greedy_algorithm(D::Array{Float64,2}, c::Float64, n::Float64) @@ -439,7 +441,7 @@ function stochastic_threshold_greedy_algorithm(D::Array{Float64,2}, c::Float64, locations_added += 1 end x_incumbent = zeros(Float64, L) - x_incumbent[ind_ones_incumbent] .= 1. + x_incumbent[ind_incumbent] .= 1. return x_incumbent, obj_incumbent end diff --git a/src/main.py b/src/main.py index 0413fa5013b7058c5e146212a36470be71972927..32d1f4e13993843267e0f597bf20a3ce89bea5cf 100644 --- a/src/main.py +++ b/src/main.py @@ -17,7 +17,7 @@ def parse_args(): parser = argparse.ArgumentParser(description='Command line arguments.') parser.add_argument('--c', type=int) - parser.add_argument('--p', type=int, default=None) + parser.add_argument('--p', type=float, default=None) parser.add_argument('--run_BB', type=bool, default=False) parser.add_argument('--run_MIR', type=bool, default=False) parser.add_argument('--run_LS', type=bool, default=False)