Nathalie BERNARD

Affichage 2 par 2 pour le front de pareto

...@@ -500,19 +500,17 @@ def process_extension_ctc(ax, pos, ext, nsolutions=False, xlabel="Best solution ...@@ -500,19 +500,17 @@ def process_extension_ctc(ax, pos, ext, nsolutions=False, xlabel="Best solution
500 500
501 if extension == "all": 501 if extension == "all":
502 parse = parse_biorseo 502 parse = parse_biorseo
503 - fig, ax = plt.subplots(1, 4, figsize=(10, 3), sharey=True) 503 + fig, ax = plt.subplots(1, 2, figsize=(10, 3), sharey=True)
504 ax = ax.flatten() 504 ax = ax.flatten()
505 process_extension(ax, 0, ".json_pmE_MFE", xlabel="Normalized $f_{1E}$", ylabel="Normalized MFE") 505 process_extension(ax, 0, ".json_pmE_MFE", xlabel="Normalized $f_{1E}$", ylabel="Normalized MFE")
506 print("--------------------------------------------------------------------------------------------") 506 print("--------------------------------------------------------------------------------------------")
507 - process_extension(ax, 1, ".json_pmE_MEA", xlabel="Normalized $f_{1E}$", ylabel="Normalized MEA") 507 + process_extension_ctc(ax, 1, ".json_pmE_MFE", xlabel="Normalized $f_{1E}$", ylabel="Normalized MFE")
508 print("--------------------------------------------------------------------------------------------") 508 print("--------------------------------------------------------------------------------------------")
509 - process_extension_ctc(ax, 2, ".json_pmE_MFE", xlabel="Normalized $f_{1E}$", ylabel="Normalized MFE") 509 +
510 - print("--------------------------------------------------------------------------------------------")
511 - process_extension_ctc(ax, 3, ".json_pmE_MEA", xlabel="Normalized $f_{1E}$", ylabel="Normalized MEA")
512 for a in ax: 510 for a in ax:
513 a.label_outer() 511 a.label_outer()
514 plt.subplots_adjust(bottom=0.2, top=0.9, left=0.07, right=0.98, hspace=0.05, wspace=0.05) 512 plt.subplots_adjust(bottom=0.2, top=0.9, left=0.07, right=0.98, hspace=0.05, wspace=0.05)
515 - plt.savefig("pareto_visualizer_json_MFE_MEA_functionE.png") 513 + plt.savefig("pareto_visualizer_json_MFE_functionE.png")
516 else: 514 else:
517 fig, ax = plt.subplots(2,1, figsize=(6,5)) 515 fig, ax = plt.subplots(2,1, figsize=(6,5))
518 plt.subplots_adjust(bottom=0.12, top=0.9, left=0.15, right=0.9, hspace=0.4) 516 plt.subplots_adjust(bottom=0.12, top=0.9, left=0.15, right=0.9, hspace=0.4)
......