Add more corrections to exploratory plots

Author: mkstratos

detclim/notebooks/Plot_Bootstrap_Results.ipynb

@@ -23,7 +23,7 @@
     "plt.style.use(\"default\")\n",
     "REJ_THR = {\n",
     "    0.01: {\"ks\": 6, \"cvm\": 9, \"mw\": 9, \"es\": 8},\n",
-    "    0.05: {\"ks\": 11, \"cvm\": 16, \"mw\": 16, \"es\": 15},\n",
+    "    0.05: {\"ks\": 11, \"cvm\": 16, \"mw\": 16, \"wsr\": 15},\n",
     "}"
    ]
   },
@@ -78,8 +78,8 @@
     "\n",
     "    for ixp, _param in enumerate(params):\n",
     "        _ntests = pbr.ntests(case_data[_param], idx)[stest]\n",
-    "        # for ixm, _method in enumerate(case_data[_param][0].methods):\n",
-    "        for ixm, _method in enumerate([\"uncor\", \"fdr_bh\"]):\n",
+    "        for ixm, _method in enumerate(case_data[_param][0].methods):\n",
+    "        # for ixm, _method in enumerate([\"uncor\", \"fdr_bh\"]):\n",
     "            _method_hum = f\"{case_data[_param][0].methods[_method]} - {case_data[_param][0].stests[stest]}\"\n",
     "            axis[ixp].semilogy(\n",
     "                _ntests[\"pct_change\"],\n",
@@ -262,6 +262,14 @@
     "    )"
    ]
   },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "daa0cd55",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  },
   {
    "cell_type": "code",
    "execution_count": null,
@@ -295,7 +303,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "lstyle = {\"uncor\": \"-\", \"fdr_bh\": \"--\"}\n",
+    "lstyle = {\"uncor\": \"-\", \"fdr_bh\": \"--\", \"fdr_by\": \"-.\", \"bonferroni\": \":\"}\n",
     "ornl_colours = {\n",
     "    \"green\": \"#007833\",\n",
     "    \"bgreen\": \"#84b641\",\n",
@@ -308,20 +316,21 @@
     "colors = {\n",
     "    \"ks\": ornl_colours[\"green\"],\n",
     "    \"cvm\": ornl_colours[\"blue\"],\n",
-    "    \"es\": ornl_colours[\"red\"],\n",
+    "    \"wsr\": ornl_colours[\"red\"],\n",
     "    \"mw\": ornl_colours[\"orange\"]\n",
     "}\n",
     "markers = {\n",
     "    \"ks\": \"o\",\n",
     "    \"cvm\": \".\",\n",
-    "    \"es\": \"H\",\n",
+    "    \"wsr\": \"H\",\n",
     "    \"mw\": \"x\"\n",
     "}\n",
     "fig, axes = plt.subplots(1, 3, figsize=(15, 4), sharey=True)\n",
     "\n",
     "for idx, param in enumerate(nfailed):\n",
     "    for stest in nfailed[param]:\n",
-    "        for method in [\"uncor\", \"fdr_bh\"]:\n",
+    "        # for method in [\"uncor\", \"fdr_bh\"]:\n",
+    "        for method in nfailed[param][stest]:\n",
     "            axes[idx].semilogy(\n",
     "                pct_change[param],\n",
     "                nfailed[param][stest][method],\n",
@@ -392,6 +401,8 @@
     "\n",
     "for idx, param in enumerate(nfailed):\n",
     "    for stest in nfailed[param]:\n",
+    "        if stest == \"wsr\":\n",
+    "            continue\n",
     "        # for method in nfailed[param][stest]:\n",
     "        for method in [\"fdr_bh\",]:\n",
     "            if method != \"uncor\":\n",
@@ -400,7 +411,7 @@
     "                    (\n",
     "                        np.array(nfailed[param][stest][method]) -\n",
     "                        np.array(nfailed[param][stest][\"uncor\"])\n",
-    "                    ) / niter,\n",
+    "                    ), # / np.array(nfailed[param][stest][\"uncor\"]),\n",
     "                    color=colors[stest],\n",
     "                    label=f\"{stest} - {method}\",\n",
     "                    ls=lstyle[method],\n",