diff --git a/results_KO_GLC/results20__cqm_1_Integer.pkl b/results_KO_GLC/results20__cqm_1_Integer.pkl index 9f765dd..40f19fd 100644 Binary files a/results_KO_GLC/results20__cqm_1_Integer.pkl and b/results_KO_GLC/results20__cqm_1_Integer.pkl differ diff --git a/results_KO_GLC/results20__cqm_2_Integer.pkl b/results_KO_GLC/results20__cqm_2_Integer.pkl index 26b4398..fcdde2f 100644 Binary files a/results_KO_GLC/results20__cqm_2_Integer.pkl and b/results_KO_GLC/results20__cqm_2_Integer.pkl differ diff --git a/results_KO_GLC/results20__cqm_3_Integer.pkl b/results_KO_GLC/results20__cqm_3_Integer.pkl index bc25c8b..e5b94ff 100644 Binary files a/results_KO_GLC/results20__cqm_3_Integer.pkl and b/results_KO_GLC/results20__cqm_3_Integer.pkl differ diff --git a/results_KO_GLC/results5__cqm_1_Integer.pkl b/results_KO_GLC/results5__cqm_1_Integer.pkl index da96efa..9ac5436 100644 Binary files a/results_KO_GLC/results5__cqm_1_Integer.pkl and b/results_KO_GLC/results5__cqm_1_Integer.pkl differ diff --git a/results_KO_GLC/results5__cqm_2_Integer.pkl b/results_KO_GLC/results5__cqm_2_Integer.pkl index 655e96a..3a171f0 100644 Binary files a/results_KO_GLC/results5__cqm_2_Integer.pkl and b/results_KO_GLC/results5__cqm_2_Integer.pkl differ diff --git a/results_KO_GLC/results5__cqm_3_Integer.pkl b/results_KO_GLC/results5__cqm_3_Integer.pkl index f8e97a8..0e71f1f 100644 Binary files a/results_KO_GLC/results5__cqm_3_Integer.pkl and b/results_KO_GLC/results5__cqm_3_Integer.pkl differ diff --git a/results_KO_GLC/results__sim_3_Integer.pkl b/results_KO_GLC/results__sim_3_Integer.pkl new file mode 100644 index 0000000..493e98b Binary files /dev/null and b/results_KO_GLC/results__sim_3_Integer.pkl differ diff --git a/solutions_quantum/bqm10_10.0_case0_Integer.pkl b/solutions_quantum/bqm10_10.0_case0_Integer.pkl deleted file mode 100644 index da2d488..0000000 Binary files a/solutions_quantum/bqm10_10.0_case0_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/bqm10_2.5_case0_Integer.pkl b/solutions_quantum/bqm10_2.5_case0_Integer.pkl deleted file mode 100644 index fa3db5c..0000000 Binary files a/solutions_quantum/bqm10_2.5_case0_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/bqm10_2.5_case1_Integer.pkl b/solutions_quantum/bqm10_2.5_case1_Integer.pkl deleted file mode 100644 index 7a8e667..0000000 Binary files a/solutions_quantum/bqm10_2.5_case1_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/bqm10_2.5_case2_Integer.pkl b/solutions_quantum/bqm10_2.5_case2_Integer.pkl deleted file mode 100644 index a94ef5f..0000000 Binary files a/solutions_quantum/bqm10_2.5_case2_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/bqm10_2.5_case3_Integer.pkl b/solutions_quantum/bqm10_2.5_case3_Integer.pkl deleted file mode 100644 index 3bc3958..0000000 Binary files a/solutions_quantum/bqm10_2.5_case3_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/bqm10_2.5_case4_Integer.pkl b/solutions_quantum/bqm10_2.5_case4_Integer.pkl deleted file mode 100644 index 3697acf..0000000 Binary files a/solutions_quantum/bqm10_2.5_case4_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/bqm10_2.5_case5_Integer.pkl b/solutions_quantum/bqm10_2.5_case5_Integer.pkl deleted file mode 100644 index 2879565..0000000 Binary files a/solutions_quantum/bqm10_2.5_case5_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/bqm10_2.5_case6_Integer.pkl b/solutions_quantum/bqm10_2.5_case6_Integer.pkl deleted file mode 100644 index bf85f30..0000000 Binary files a/solutions_quantum/bqm10_2.5_case6_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/bqm10_2.5_case7_Integer.pkl b/solutions_quantum/bqm10_2.5_case7_Integer.pkl deleted file mode 100644 index 7251ff2..0000000 Binary files a/solutions_quantum/bqm10_2.5_case7_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/bqm10_5.0_case0_Integer.pkl b/solutions_quantum/bqm10_5.0_case0_Integer.pkl deleted file mode 100644 index 4705861..0000000 Binary files a/solutions_quantum/bqm10_5.0_case0_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/bqm10_7.5_case0_Integer.pkl b/solutions_quantum/bqm10_7.5_case0_Integer.pkl deleted file mode 100644 index 12b9c48..0000000 Binary files a/solutions_quantum/bqm10_7.5_case0_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/bqm20_10.0_case0_Integer.pkl b/solutions_quantum/bqm20_10.0_case0_Integer.pkl deleted file mode 100644 index 08aeaca..0000000 Binary files a/solutions_quantum/bqm20_10.0_case0_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/bqm20_2.5_case0_Integer.pkl b/solutions_quantum/bqm20_2.5_case0_Integer.pkl deleted file mode 100644 index 61909f1..0000000 Binary files a/solutions_quantum/bqm20_2.5_case0_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/bqm20_5.0_case0_Integer.pkl b/solutions_quantum/bqm20_5.0_case0_Integer.pkl deleted file mode 100644 index a306ba5..0000000 Binary files a/solutions_quantum/bqm20_5.0_case0_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/bqm20_7.5_case0_Integer.pkl b/solutions_quantum/bqm20_7.5_case0_Integer.pkl deleted file mode 100644 index b8db42c..0000000 Binary files a/solutions_quantum/bqm20_7.5_case0_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/cqm100_case7_Integer.pkl b/solutions_quantum/cqm100_case7_Integer.pkl deleted file mode 100644 index 2e61601..0000000 Binary files a/solutions_quantum/cqm100_case7_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/cqm10_case7_Integer.pkl b/solutions_quantum/cqm10_case7_Integer.pkl index 4658681..c7f84af 100644 Binary files a/solutions_quantum/cqm10_case7_Integer.pkl and b/solutions_quantum/cqm10_case7_Integer.pkl differ diff --git a/solutions_quantum/cqm15_case7_Integer.pkl b/solutions_quantum/cqm15_case7_Integer.pkl index f4ad575..4843a02 100644 Binary files a/solutions_quantum/cqm15_case7_Integer.pkl and b/solutions_quantum/cqm15_case7_Integer.pkl differ diff --git a/solutions_quantum/cqm20_case0_Integer.pkl b/solutions_quantum/cqm20_case0_Integer.pkl deleted file mode 100644 index dba6ae3..0000000 Binary files a/solutions_quantum/cqm20_case0_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/cqm20_case1_Integer.pkl b/solutions_quantum/cqm20_case1_Integer.pkl deleted file mode 100644 index a1c6319..0000000 Binary files a/solutions_quantum/cqm20_case1_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/cqm20_case2_Integer.pkl b/solutions_quantum/cqm20_case2_Integer.pkl deleted file mode 100644 index bbab92d..0000000 Binary files a/solutions_quantum/cqm20_case2_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/cqm20_case3_Integer.pkl b/solutions_quantum/cqm20_case3_Integer.pkl deleted file mode 100644 index fdd3c63..0000000 Binary files a/solutions_quantum/cqm20_case3_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/cqm20_case4_Integer.pkl b/solutions_quantum/cqm20_case4_Integer.pkl deleted file mode 100644 index 9160747..0000000 Binary files a/solutions_quantum/cqm20_case4_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/cqm20_case5_Integer.pkl b/solutions_quantum/cqm20_case5_Integer.pkl deleted file mode 100644 index 505a6cc..0000000 Binary files a/solutions_quantum/cqm20_case5_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/cqm20_case6_Integer.pkl b/solutions_quantum/cqm20_case6_Integer.pkl deleted file mode 100644 index 75e835d..0000000 Binary files a/solutions_quantum/cqm20_case6_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/cqm20_case7_Integer.pkl b/solutions_quantum/cqm20_case7_Integer.pkl index 09204c9..cb28f90 100644 Binary files a/solutions_quantum/cqm20_case7_Integer.pkl and b/solutions_quantum/cqm20_case7_Integer.pkl differ diff --git a/solutions_quantum/cqm20_case8_Integer.pkl b/solutions_quantum/cqm20_case8_Integer.pkl deleted file mode 100644 index 7fcad16..0000000 Binary files a/solutions_quantum/cqm20_case8_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/cqm20_case9_Integer.pkl b/solutions_quantum/cqm20_case9_Integer.pkl deleted file mode 100644 index df03416..0000000 Binary files a/solutions_quantum/cqm20_case9_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/cqm25_case7_Integer.pkl b/solutions_quantum/cqm25_case7_Integer.pkl index 134526e..6a9515f 100644 Binary files a/solutions_quantum/cqm25_case7_Integer.pkl and b/solutions_quantum/cqm25_case7_Integer.pkl differ diff --git a/solutions_quantum/cqm30_case7_Integer.pkl b/solutions_quantum/cqm30_case7_Integer.pkl index 1ac1bba..0ace9fd 100644 Binary files a/solutions_quantum/cqm30_case7_Integer.pkl and b/solutions_quantum/cqm30_case7_Integer.pkl differ diff --git a/solutions_quantum/cqm40_case7_Integer.pkl b/solutions_quantum/cqm40_case7_Integer.pkl index 58a22b9..3ad3be8 100644 Binary files a/solutions_quantum/cqm40_case7_Integer.pkl and b/solutions_quantum/cqm40_case7_Integer.pkl differ diff --git a/solutions_quantum/cqm50_case7_Integer.pkl b/solutions_quantum/cqm50_case7_Integer.pkl deleted file mode 100644 index 9b70e70..0000000 Binary files a/solutions_quantum/cqm50_case7_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/cqm5_case0_Integer.pkl b/solutions_quantum/cqm5_case0_Integer.pkl new file mode 100644 index 0000000..6378b00 Binary files /dev/null and b/solutions_quantum/cqm5_case0_Integer.pkl differ diff --git a/solutions_quantum/cqm5_case1_Integer.pkl b/solutions_quantum/cqm5_case1_Integer.pkl new file mode 100644 index 0000000..396f89c Binary files /dev/null and b/solutions_quantum/cqm5_case1_Integer.pkl differ diff --git a/solutions_quantum/cqm5_case2_Integer.pkl b/solutions_quantum/cqm5_case2_Integer.pkl new file mode 100644 index 0000000..f2dd771 Binary files /dev/null and b/solutions_quantum/cqm5_case2_Integer.pkl differ diff --git a/solutions_quantum/cqm5_case3_Integer.pkl b/solutions_quantum/cqm5_case3_Integer.pkl new file mode 100644 index 0000000..a1299c9 Binary files /dev/null and b/solutions_quantum/cqm5_case3_Integer.pkl differ diff --git a/solutions_quantum/cqm5_case4_Integer.pkl b/solutions_quantum/cqm5_case4_Integer.pkl new file mode 100644 index 0000000..6b96d7d Binary files /dev/null and b/solutions_quantum/cqm5_case4_Integer.pkl differ diff --git a/solutions_quantum/cqm5_case5_Integer.pkl b/solutions_quantum/cqm5_case5_Integer.pkl new file mode 100644 index 0000000..ea06914 Binary files /dev/null and b/solutions_quantum/cqm5_case5_Integer.pkl differ diff --git a/solutions_quantum/cqm5_case6_Integer.pkl b/solutions_quantum/cqm5_case6_Integer.pkl new file mode 100644 index 0000000..02017c8 Binary files /dev/null and b/solutions_quantum/cqm5_case6_Integer.pkl differ diff --git a/solutions_quantum/cqm5_case7_Integer.pkl b/solutions_quantum/cqm5_case7_Integer.pkl index 7ca7bb5..34b087d 100644 Binary files a/solutions_quantum/cqm5_case7_Integer.pkl and b/solutions_quantum/cqm5_case7_Integer.pkl differ diff --git a/solutions_quantum/cqm5_case8_Integer.pkl b/solutions_quantum/cqm5_case8_Integer.pkl new file mode 100644 index 0000000..baeeebd Binary files /dev/null and b/solutions_quantum/cqm5_case8_Integer.pkl differ diff --git a/solutions_quantum/cqm5_case9_Integer.pkl b/solutions_quantum/cqm5_case9_Integer.pkl new file mode 100644 index 0000000..0c1ec05 Binary files /dev/null and b/solutions_quantum/cqm5_case9_Integer.pkl differ diff --git a/solutions_quantum/cqm60_case7_Integer.pkl b/solutions_quantum/cqm60_case7_Integer.pkl index d1c1ed2..abff3d1 100644 Binary files a/solutions_quantum/cqm60_case7_Integer.pkl and b/solutions_quantum/cqm60_case7_Integer.pkl differ diff --git a/solutions_quantum/cqm6_case7_Integer.pkl b/solutions_quantum/cqm6_case7_Integer.pkl new file mode 100644 index 0000000..22ea541 Binary files /dev/null and b/solutions_quantum/cqm6_case7_Integer.pkl differ diff --git a/solutions_quantum/cqm70_case7_Integer.pkl b/solutions_quantum/cqm70_case7_Integer.pkl deleted file mode 100644 index 7dc9be4..0000000 Binary files a/solutions_quantum/cqm70_case7_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/cqm7_case7_Integer.pkl b/solutions_quantum/cqm7_case7_Integer.pkl new file mode 100644 index 0000000..f1d190e Binary files /dev/null and b/solutions_quantum/cqm7_case7_Integer.pkl differ diff --git a/solutions_quantum/cqm80_case7_Integer.pkl b/solutions_quantum/cqm80_case7_Integer.pkl deleted file mode 100644 index 8442688..0000000 Binary files a/solutions_quantum/cqm80_case7_Integer.pkl and /dev/null differ diff --git a/solutions_quantum/sim_0.0001_case0_Integer.pkl b/solutions_quantum/sim_0.0001_case0_Integer.pkl new file mode 100644 index 0000000..0a3ae15 Binary files /dev/null and b/solutions_quantum/sim_0.0001_case0_Integer.pkl differ diff --git a/solutions_quantum/sim_0.0_case0_Integer.pkl b/solutions_quantum/sim_0.0_case0_Integer.pkl new file mode 100644 index 0000000..41ad373 Binary files /dev/null and b/solutions_quantum/sim_0.0_case0_Integer.pkl differ diff --git a/solutions_quantum/sim_0.1_case0_Integer.pkl b/solutions_quantum/sim_0.1_case0_Integer.pkl new file mode 100644 index 0000000..3bd308d Binary files /dev/null and b/solutions_quantum/sim_0.1_case0_Integer.pkl differ diff --git a/solutions_quantum/sim_1.0_case0_Integer.pkl b/solutions_quantum/sim_1.0_case0_Integer.pkl new file mode 100644 index 0000000..392d342 Binary files /dev/null and b/solutions_quantum/sim_1.0_case0_Integer.pkl differ diff --git a/solutions_quantum/sim_1.5_case0_Integer.pkl b/solutions_quantum/sim_1.5_case0_Integer.pkl new file mode 100644 index 0000000..c5d4412 Binary files /dev/null and b/solutions_quantum/sim_1.5_case0_Integer.pkl differ diff --git a/solutions_quantum/sim_10.0_case0_Integer.pkl b/solutions_quantum/sim_10.0_case0_Integer.pkl new file mode 100644 index 0000000..937e8ce Binary files /dev/null and b/solutions_quantum/sim_10.0_case0_Integer.pkl differ diff --git a/solutions_quantum/sim_2.0_case0_Integer.pkl b/solutions_quantum/sim_2.0_case0_Integer.pkl new file mode 100644 index 0000000..e4c3e26 Binary files /dev/null and b/solutions_quantum/sim_2.0_case0_Integer.pkl differ diff --git a/solutions_quantum/sim_2.5_case0_Integer.pkl b/solutions_quantum/sim_2.5_case0_Integer.pkl new file mode 100644 index 0000000..70c089d Binary files /dev/null and b/solutions_quantum/sim_2.5_case0_Integer.pkl differ diff --git a/solutions_quantum/tmin_plot.py b/solutions_quantum/tmin_plot.py index 071f79b..c9cee79 100644 --- a/solutions_quantum/tmin_plot.py +++ b/solutions_quantum/tmin_plot.py @@ -17,6 +17,8 @@ def load_data(solver,case, tmin): def plotting_objective(solver, case, tmins): dmax = 40 + cplex_t = 7.89 + cplex_obj = 188.75 objectives = {} comp_time = {} @@ -40,12 +42,14 @@ def plotting_objective(solver, case, tmins): ax1.plot(tmins, y1, "o--", color = "green", label = "mean") ax1.plot(tmins, y2, ":", color = "green", label = "envelope") ax1.plot(tmins, y3, ":", color = "green") + cplex_objs = [cplex_obj for _ in tmins] + ax1.plot(tmins, cplex_objs, ":", color = "red", label = "CPLEX solver") ax1.legend(ncol = 2, loc='best') y1 = [np.mean(comp_time[tmin]) for tmin in tmins] ax2.plot(tmins, y1, "d--", color = "blue", label = "mean hybrid solver") - cplex_t = [7.89 for _ in tmins] - ax2.plot(tmins, cplex_t, ":", color = "red", label = "CPLEX solver") + cplex_ts = [cplex_t for _ in tmins] + ax2.plot(tmins, cplex_ts, ":", color = "red", label = "CPLEX solver") ax2.legend(loc='best') y2 = [np.min(qpu_acess_time[tmin]) for tmin in tmins] @@ -61,12 +65,14 @@ def plotting_objective(solver, case, tmins): ax3.set_xlabel("t min parameter") ax3.set_ylim(bottom=0, top = 0.04) + plt.xscale("log") + plt.savefig(f"{solver}_{case}_sweep_tmin.pdf") if __name__ == "__main__": - tmins = [5,10,15,20,25,30,40] + tmins = [5, 6, 7, 10,15,20,25,30,40, 60] solver = "cqm" case = "case7" diff --git a/solutions_quantum/wisla/cqm_wisla5_case1.pkl b/solutions_quantum/wisla/cqm_wisla5_case1.pkl deleted file mode 100644 index cfe9637..0000000 Binary files a/solutions_quantum/wisla/cqm_wisla5_case1.pkl and /dev/null differ diff --git a/solutions_quantum/wisla/cqm_wisla6_case1.pkl b/solutions_quantum/wisla/cqm_wisla6_case1.pkl deleted file mode 100644 index f60004f..0000000 Binary files a/solutions_quantum/wisla/cqm_wisla6_case1.pkl and /dev/null differ diff --git a/solutions_quantum/wisla/cqm_wisla7_case1.pkl b/solutions_quantum/wisla/cqm_wisla7_case1.pkl deleted file mode 100644 index c7635ec..0000000 Binary files a/solutions_quantum/wisla/cqm_wisla7_case1.pkl and /dev/null differ diff --git a/solutions_quantum/wisla/real_wisla_case1.pkl b/solutions_quantum/wisla/real_wisla_case1.pkl deleted file mode 100644 index 32223f5..0000000 Binary files a/solutions_quantum/wisla/real_wisla_case1.pkl and /dev/null differ