Skip to content
Snippets Groups Projects
Commit bb77f6ff authored by David Radu's avatar David Radu
Browse files

moved local search time in jl

parent 3ca733e9
No related branches found
No related tags found
No related merge requests found
using PyCall
using Dates
include("optimisation_models.jl")
include("MCP_heuristics.jl")
......@@ -27,10 +28,14 @@ function main_MIRSA(index_dict, deployment_dict, D, c, N, I, E, T_init, R, run)
x_sol, LB_sol, obj_sol = Array{Float64, 2}(undef, R, L), Array{Float64, 1}(undef, R), Array{Float64, 2}(undef, R, I)
x_init = solve_MILP_partitioning(D, c, n_partitions, index_dict, "Gurobi")
t1 = now()
for r = 1:R
println("Run ", r, "/", R)
x_sol[r, :], LB_sol[r], obj_sol[r, :] = simulated_annealing_local_search_partition(D, c, n_partitions, N, I, E, x_init, T_init, index_dict)
end
t2 = now()
dt = (t2 - t1)/R
println(dt)
elseif run == "SALSR"
......
......@@ -107,13 +107,11 @@ if __name__ == '__main__':
for c in params['c']:
print('Running heuristic for c value of', c)
start = time.time()
jl_selected, jl_objective, jl_traj = Main.main_MIRSA(jl_dict['index_dict'], jl_dict['deployment_dict'],
criticality_data, c, params['neighborhood'],
params['no_iterations'], params['no_epochs'],
params['initial_temp'], params['no_runs'],
params['algorithm'])
output_folder = init_folder(model_parameters, c, suffix='_MIRSA')
with open(join(output_folder, 'config_model.yaml'), 'w') as outfile:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment