Automatic params table can now handle priors

monash-emu · Jul 17, 2023 · 606cc7b · 606cc7b
1 parent 2a2055e
commit 606cc7b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/notebooks/user/rragonnet/project_specific/School_Closure/param_tables.ipynb b/notebooks/user/rragonnet/project_specific/School_Closure/param_tables.ipynb
@@ -2,19 +2,29 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 110,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
     "from autumn.projects.sm_covid2.common_school.project_maker import get_school_project_parameter_set\n",
+    "from autumn.projects.sm_covid2.common_school.calibration import get_bcm_object\n",
     "import pandas as pd\n",
     "from copy import copy\n",
     "from pathlib import Path"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 111,
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "bcm = get_bcm_object(\"FRA\")"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -23,7 +33,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 112,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -36,7 +46,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 113,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -51,7 +61,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 114,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -68,7 +78,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 115,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -77,14 +87,20 @@
     "\n",
     "    for index in params_df.index:\n",
     "        if params_df.loc[index, 'value'] == \"LOAD\":\n",
-    "            params_df.loc[index, 'value'] = get_param_val(params_df.loc[index, 'param_key'], model_params)\n",
+    "            p_name = params_df.loc[index, 'param_key']\n",
+    "            if p_name in bcm.priors:\n",
+    "                p = bcm.priors[p_name]\n",
+    "                displayed_value = p.__repr__().replace(\"UniformPrior bounds:\", \"Uniform\")\n",
+    "            else:\n",
+    "                displayed_value = get_param_val(p_name, model_params)\n",
+    "            params_df.loc[index, 'value'] = displayed_value\n",
     "\n",
     "    return params_df"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 116,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -93,7 +109,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 117,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -106,7 +122,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 118,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -115,7 +131,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 119,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -124,7 +140,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 120,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [

diff --git a/notebooks/user/rragonnet/project_specific/School_Closure/params_info.xlsx b/notebooks/user/rragonnet/project_specific/School_Closure/params_info.xlsx