Update app.py

app.py

@@ -530,32 +530,48 @@ def fig_roc_curves():
     return fig
 
 def fig_tpr_at_low_fpr():
-    fig, axes = plt.subplots(1, 2, figsize=(17, 7.2)); apply_academic_style(fig, axes); labels_all, tpr5_all, tpr1_all, clrs_all, hatches_all = [], [], [], [], []
+    fig, axes = plt.subplots(2, 1, figsize=(10.5, 12.5)); apply_academic_style(fig, axes); labels_all, tpr5_all, tpr1_all, clrs_all, hatches_all = [], [], [], [], []
     ls_h_list = [HATCH_BASELINE] + HATCH_LS
     ls_c_list = [CHART_C['baseline']] + CHART_C['ls_colors']
     
-    for i, (k, l) in enumerate(zip(LS_KEYS, LS_LABELS_PLOT)): 
+    for i, (k, l) in enumerate(zip(LS_KEYS, LS_LABELS_PLOT)):
         labels_all.append(l); tpr5_all.append(gm(k, 'tpr_at_5fpr')); tpr1_all.append(gm(k, 'tpr_at_1fpr'))
         clrs_all.append(ls_c_list[i]); hatches_all.append(ls_h_list[i])
-    for i, (k, l) in enumerate(zip(OP_KEYS, OP_LABELS_PLOT)): 
+    for i, (k, l) in enumerate(zip(OP_KEYS, OP_LABELS_PLOT)):
         labels_all.append(l); tpr5_all.append(gm(k, 'tpr_at_5fpr')); tpr1_all.append(gm(k, 'tpr_at_1fpr'))
         clrs_all.append(CHART_C['op_colors'][i]); hatches_all.append(HATCH_OP[i])
-        
-    x = range(len(labels_all)); ax = axes[0]; 
+    
+    x = range(len(labels_all))
+    ax = axes[0]
     bars = ax.bar(x, tpr5_all, color=clrs_all, width=0.65, edgecolor='black', linewidth=1.5, zorder=3)
     for bar, h in zip(bars, hatches_all):
-        if h: bar.set_hatch(h)
-    ax.set_ylim(0, max(tpr5_all) * 1.22)
-    for b, v in zip(bars, tpr5_all): ax.text(b.get_x()+b.get_width()/2, v + max(tpr5_all) * 0.012, f'{v:.3f}', ha='center', fontsize=THESIS_LEGEND_SIZE, fontweight='normal', color='black')
-    ax.set_ylabel('TPR @ 5% FPR', fontsize=THESIS_AXIS_LABEL_SIZE, fontweight='normal'); ax.set_title('Attack Power at 5% FPR', fontsize=THESIS_SUPTITLE_SIZE, fontweight='normal', pad=15); ax.set_xticks(x); ax.set_xticklabels(labels_all, rotation=25, ha='right', fontsize=THESIS_AXIS_LABEL_SIZE); ax.axhline(0.05, color='gray', ls='--', lw=2, label='Random (0.05)'); ax.legend(facecolor='white', edgecolor='black', labelcolor='black', fontsize=THESIS_LEGEND_SIZE)
+        if h:
+            bar.set_hatch(h)
+    ax.set_ylim(0, max(tpr5_all) * 1.24)
+    for b, v in zip(bars, tpr5_all):
+        ax.text(b.get_x() + b.get_width() / 2, v + max(tpr5_all) * 0.012, f'{v:.3f}', ha='center', fontsize=THESIS_LEGEND_SIZE, fontweight='normal', color='black')
+    ax.set_ylabel('TPR @ 5% FPR', fontsize=THESIS_AXIS_LABEL_SIZE, fontweight='normal')
+    ax.set_title('Attack Power at 5% FPR', fontsize=THESIS_SUPTITLE_SIZE, fontweight='normal', pad=15)
+    ax.set_xticks(list(x))
+    ax.set_xticklabels(labels_all, rotation=25, ha='right', fontsize=THESIS_AXIS_LABEL_SIZE)
+    ax.axhline(0.05, color='gray', ls='--', lw=2, label='Random (0.05)')
+    ax.legend(facecolor='white', edgecolor='black', labelcolor='black', fontsize=THESIS_LEGEND_SIZE)
     
-    ax = axes[1]; 
+    ax = axes[1]
     bars = ax.bar(x, tpr1_all, color=clrs_all, width=0.65, edgecolor='black', linewidth=1.5, zorder=3)
     for bar, h in zip(bars, hatches_all):
-        if h: bar.set_hatch(h)
-    ax.set_ylim(0, max(tpr1_all) * 1.24)
-    for b, v in zip(bars, tpr1_all): ax.text(b.get_x()+b.get_width()/2, v + max(tpr1_all) * 0.012, f'{v:.3f}', ha='center', fontsize=THESIS_LEGEND_SIZE, fontweight='normal', color='black')
-    ax.set_ylabel('TPR @ 1% FPR', fontsize=THESIS_AXIS_LABEL_SIZE, fontweight='normal'); ax.set_title('Attack Power at 1% FPR (Strict)', fontsize=THESIS_SUPTITLE_SIZE, fontweight='normal', pad=15); ax.set_xticks(x); ax.set_xticklabels(labels_all, rotation=25, ha='right', fontsize=THESIS_AXIS_LABEL_SIZE); ax.axhline(0.01, color='gray', ls='--', lw=2, label='Random (0.01)'); ax.legend(facecolor='white', edgecolor='black', labelcolor='black', fontsize=THESIS_LEGEND_SIZE); plt.tight_layout()
+        if h:
+            bar.set_hatch(h)
+    ax.set_ylim(0, max(tpr1_all) * 1.28)
+    for b, v in zip(bars, tpr1_all):
+        ax.text(b.get_x() + b.get_width() / 2, v + max(tpr1_all) * 0.012, f'{v:.3f}', ha='center', fontsize=THESIS_LEGEND_SIZE, fontweight='normal', color='black')
+    ax.set_ylabel('TPR @ 1% FPR', fontsize=THESIS_AXIS_LABEL_SIZE, fontweight='normal')
+    ax.set_title('Attack Power at 1% FPR (Strict)', fontsize=THESIS_SUPTITLE_SIZE, fontweight='normal', pad=15)
+    ax.set_xticks(list(x))
+    ax.set_xticklabels(labels_all, rotation=25, ha='right', fontsize=THESIS_AXIS_LABEL_SIZE)
+    ax.axhline(0.01, color='gray', ls='--', lw=2, label='Random (0.01)')
+    ax.legend(facecolor='white', edgecolor='black', labelcolor='black', fontsize=THESIS_LEGEND_SIZE)
+    plt.subplots_adjust(hspace=0.35, top=0.95, bottom=0.09, left=0.09, right=0.98)
     return fig
 
 def fig_loss_gap_waterfall():