From a9119e513c389fde07eeb1f0817a0191c88112e9 Mon Sep 17 00:00:00 2001
From: dcradu <dcradu@uliege.be>
Date: Mon, 19 Apr 2021 18:13:25 +0200
Subject: [PATCH] fixed bug on argparser for SGH
---
src/jl/MCP_heuristics.jl | 6 ++++--
src/main.py | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/jl/MCP_heuristics.jl b/src/jl/MCP_heuristics.jl
index be9d71b..c9c569c 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 0413fa5..32d1f4e 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)
--
GitLab