some updates

FalseNegativeLab · Oct 3, 2024 · 7d760dc · 7d760dc
1 parent dc59368
commit 7d760dc
Show file tree

Hide file tree

Showing 12 changed files with 869 additions and 806 deletions.
diff --git a/...-auc-test-aggregated-not-stratified.ipynb → ...xperiment-aggregated-not-stratified.ipynb b/...-auc-test-aggregated-not-stratified.ipynb → ...xperiment-aggregated-not-stratified.ipynb
diff --git a/..._experiments/03-auc-test-aggregated.ipynb → ...xperiments/01-experiment-aggregated.ipynb b/..._experiments/03-auc-test-aggregated.ipynb → ...xperiments/01-experiment-aggregated.ipynb
@@ -161,13 +161,6 @@
     "print(tmp.to_latex(float_format=\"%.2f\").replace('_', ' '))"
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "metadata": {},
-   "outputs": [],
-   "source": []
-  },
   {
    "cell_type": "code",
    "execution_count": 34,
@@ -222,9 +215,9 @@
     "        p = np.sum(y_test)\n",
     "        n = len(y_test) - np.sum(y_test)\n",
     "\n",
-    "        acc = np.round((tp + tn) / (p + n), 4)\n",
-    "        sens = np.round((tp) / (p), 4)\n",
-    "        spec = np.round((tn) / (n), 4)\n",
+    "        acc = (tp + tn) / (p + n)\n",
+    "        sens = (tp) / (p)\n",
+    "        spec = (tn) / (n)\n",
     "\n",
     "        accs.append(acc)\n",
     "        senss.append(sens)\n",
@@ -242,7 +235,7 @@
     "            tp = np.sum((y_pred >= th) & (y_test == 1))\n",
     "            tn = np.sum((y_pred < th) & (y_test == 0))\n",
     "\n",
-    "            tmp_accs.append(np.round((tp + tn) / len(y_test), 4))\n",
+    "            tmp_accs.append((tp + tn) / len(y_test))\n",
     "\n",
     "        #print(th, np.mean(tmp_accs), best_acc)\n",
     "\n",
@@ -260,9 +253,9 @@
     "        p = np.sum(y_test)\n",
     "        n = len(y_test) - np.sum(y_test)\n",
     "\n",
-    "        best_accs.append(np.round((tp + tn) / len(y_test), 4))\n",
-    "        best_senss.append(np.round((tp) / (p), 4))\n",
-    "        best_specs.append(np.round((tn) / (n), 4))\n",
+    "        best_accs.append((tp + tn) / len(y_test))\n",
+    "        best_senss.append((tp) / (p))\n",
+    "        best_specs.append((tn) / (n))\n",
     "\n",
     "    acc = np.mean(accs)\n",
     "    sens = np.mean(senss)\n",

diff --git a/notebooks/auc_experiments/01-experiment-single.ipynb b/notebooks/auc_experiments/01-experiment-single.ipynb
diff --git a/notebooks/auc_experiments/03-auc-test.ipynb b/notebooks/auc_experiments/03-auc-test.ipynb