diff --git a/config_model.yml b/config_model.yml index e49eb3fe3cee8eb2a8a0d280b1c360d7a987ea96..0e3c4b4032500c6648fa8115d35d0235516cb3af 100644 --- a/config_model.yml +++ b/config_model.yml @@ -37,7 +37,7 @@ siting_params: no_iterations: 2000 no_epochs: 500 initial_temp: 100. - no_runs: 100 + no_runs: 50 algorithm: 'MIR' # 'SGH', 'RS' GRED_DET: set: False diff --git a/src/jl/SitingHeuristics.jl b/src/jl/SitingHeuristics.jl index 8892e696921de90594141c563d4f852a065a776b..7790a320d8fe9a776495a64411f36e82e723ae77 100644 --- a/src/jl/SitingHeuristics.jl +++ b/src/jl/SitingHeuristics.jl @@ -68,7 +68,6 @@ function main_MIRSA(index_dict, deployment_dict, D, c, N, I, E, T_init, R, run, x_init = convert.(Float64, x_init) for r = 1:R - println(r) x_sol[r, :], LB_sol[r], obj_sol[r, :] = simulated_annealing_local_search(D, c, n, N, I, E, x_init, T_init, legacy_index) end @@ -85,7 +84,6 @@ function main_MIRSA(index_dict, deployment_dict, D, c, N, I, E, T_init, R, run, x_init_best = x_init[LB_init_best, :] for r = 1:R - println(r) x_sol[r, :], LB_sol[r], obj_sol[r, :] = simulated_annealing_local_search(D, c, n, N, I, E, x_init_best, T_init, legacy_index) end diff --git a/src/main.py b/src/main.py index a02a5559ed553d014a950ba5e3513f082b83c57a..e6b9cc42b7757e999be4c4f4c0361866ad9f0ef4 100644 --- a/src/main.py +++ b/src/main.py @@ -154,7 +154,7 @@ if __name__ == '__main__': end = time.time() print(f"Average CPU time for c={c}: {round((end-start)/params['no_runs'], 1)} s") - output_folder = init_folder(model_parameters, c, suffix=f"_LS_{args['--LS_init_algorithm']}") + output_folder = init_folder(model_parameters, c, suffix=f"_LS_{args['LS_init_algorithm']}") with open(join(output_folder, 'config_model.yaml'), 'w') as outfile: yaml.dump(model_parameters, outfile, default_flow_style=False, sort_keys=False)