Fix units of beta for Scenario 1

gyorilab · Jul 10, 2023 · 27084e0 · 27084e0
1 parent 0da01e9
commit 27084e0
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/notebooks/hackathon_2023.07/scenario1.ipynb b/notebooks/hackathon_2023.07/scenario1.ipynb
@@ -55,8 +55,8 @@
  " 'alpha': Parameter(name='alpha', value=0.000064, units=dimensionless_units()),\n",
  " 'rho': Parameter(name='rho', value=1/9, units=per_day_units()),\n",
  " 'N': Parameter(name='N', value=5_600_000, units=person_units()),\n",
- " 'beta_s': Parameter(name='beta_s', value=1, units=per_day_per_person_units()),\n",
- " 'beta_c': Parameter(name='beta_c', value=0.4, units=per_day_per_person_units()),\n",
+ " 'beta_s': Parameter(name='beta_s', value=1, units=per_day_units()),\n",
+ " 'beta_c': Parameter(name='beta_c', value=0.4, units=per_day_units()),\n",
  " 't_0': Parameter(name='t_0', value=89, unts=day_units, units=day_units()),\n",
  " # D=11, gamma = 1/D, R_0 = 5 and\n",
  " # beta = R_0 * gamma * mask(t) so kappa = 5/11\n",
@@ -141,7 +141,7 @@
  "parameters['k_1'] = Parameter(name='k_1', value=5.0, units=dimensionless_units())\n",
  "parameters['k_2'] = Parameter(name='k_2', value=1.0, units=dimensionless_units())\n",
  "parameters['t_1'] = Parameter(name='t_1', value=154, units=day_units())\n",
- "parameters['beta_nc'] = Parameter(name='beta_nc', value=0.5)\n",
+ "parameters['beta_nc'] = Parameter(name='beta_nc', value=0.5, units=per_day_units())\n",
  "tm.parameters = parameters\n",
  "tm.annotations = Annotations(name='Scenario 1c')\n",
  "m_2 = (beta_s - beta_c) / (1 + sympy.exp(-k_1*(t_0-t))) + (beta_c - beta_nc) / (1 + sympy.exp(-k_2*(t_1-t))) + beta_nc"

diff --git a/notebooks/hackathon_2023.07/scenario1_a.json b/notebooks/hackathon_2023.07/scenario1_a.json
@@ -195,16 +195,16 @@
  "id": "beta_c",
  "value": 0.4,
  "units": {
- "expression": "1/(day*person)",
- "expression_mathml": "<apply><divide/><cn>1</cn><apply><times/><ci>day</ci><ci>person</ci></apply></apply>"
+ "expression": "1/day",
+ "expression_mathml": "<apply><power/><ci>day</ci><cn>-1</cn></apply>"
  }
  },
  {
  "id": "beta_s",
  "value": 1.0,
  "units": {
- "expression": "1/(day*person)",
- "expression_mathml": "<apply><divide/><cn>1</cn><apply><times/><ci>day</ci><ci>person</ci></apply></apply>"
+ "expression": "1/day",
+ "expression_mathml": "<apply><power/><ci>day</ci><cn>-1</cn></apply>"
  }
  },
  {

diff --git a/notebooks/hackathon_2023.07/scenario1_c.json b/notebooks/hackathon_2023.07/scenario1_c.json
@@ -187,20 +187,24 @@
  "id": "beta_c",
  "value": 0.4,
  "units": {
- "expression": "1/(day*person)",
- "expression_mathml": "<apply><divide/><cn>1</cn><apply><times/><ci>day</ci><ci>person</ci></apply></apply>"
+ "expression": "1/day",
+ "expression_mathml": "<apply><power/><ci>day</ci><cn>-1</cn></apply>"
  }
  },
  {
  "id": "beta_nc",
- "value": 0.5
+ "value": 0.5,
+ "units": {
+ "expression": "1/day",
+ "expression_mathml": "<apply><power/><ci>day</ci><cn>-1</cn></apply>"
+ }
  },
  {
  "id": "beta_s",
  "value": 1.0,
  "units": {
- "expression": "1/(day*person)",
- "expression_mathml": "<apply><divide/><cn>1</cn><apply><times/><ci>day</ci><ci>person</ci></apply></apply>"
+ "expression": "1/day",
+ "expression_mathml": "<apply><power/><ci>day</ci><cn>-1</cn></apply>"
  }
  },
  {

diff --git a/notebooks/hackathon_2023.07/scenario1_d.json b/notebooks/hackathon_2023.07/scenario1_d.json
@@ -187,20 +187,24 @@
  "id": "beta_c",
  "value": 0.4,
  "units": {
- "expression": "1/(day*person)",
- "expression_mathml": "<apply><divide/><cn>1</cn><apply><times/><ci>day</ci><ci>person</ci></apply></apply>"
+ "expression": "1/day",
+ "expression_mathml": "<apply><power/><ci>day</ci><cn>-1</cn></apply>"
  }
  },
  {
  "id": "beta_nc",
- "value": 0.5
+ "value": 0.5,
+ "units": {
+ "expression": "1/day",
+ "expression_mathml": "<apply><power/><ci>day</ci><cn>-1</cn></apply>"
+ }
  },
  {
  "id": "beta_s",
  "value": 1.0,
  "units": {
- "expression": "1/(day*person)",
- "expression_mathml": "<apply><divide/><cn>1</cn><apply><times/><ci>day</ci><ci>person</ci></apply></apply>"
+ "expression": "1/day",
+ "expression_mathml": "<apply><power/><ci>day</ci><cn>-1</cn></apply>"
  }
  },
  {