Fix some rate law patterns

gyorilab · Jul 13, 2023 · 90b950d · 90b950d
1 parent c9771ef
commit 90b950d
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 43 deletions.
diff --git a/notebooks/hackathon_2023.07/scenario2.ipynb b/notebooks/hackathon_2023.07/scenario2.ipynb
@@ -126,7 +126,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "beta_scale_type = 'var'  # var\n",
+    "beta_scale_type = 'static'  # var\n",
     "if beta_scale_type == 'static':\n",
     "    beta_scale = beta_scale_static\n",
     "else:\n",
@@ -255,11 +255,11 @@
     "    templates.append(t)\n",
     "    t = ControlledConversion(subject=c['V1'], outcome=c['A'],\n",
     "                             controller=_d(inf),\n",
-    "                             rate_law=ai*beta*beta_scale*S*inf_term)\n",
+    "                             rate_law=ai*beta*beta_scale*V1*inf_term)\n",
     "    templates.append(t)\n",
     "    t = ControlledConversion(subject=c['V2'], outcome=c['A'],\n",
     "                             controller=_d(inf),\n",
-    "                             rate_law=ai*beta*beta_scale*S*inf_term)\n",
+    "                             rate_law=ai*beta*beta_scale*V2*inf_term)\n",
     "    templates.append(t)\n",
     "\n",
     "    # Infection sym\n",

diff --git a/notebooks/hackathon_2023.07/scenario2_a_beta_scale_static.json b/notebooks/hackathon_2023.07/scenario2_a_beta_scale_static.json
@@ -1031,13 +1031,13 @@
     },
     {
      "target": "t2",
-     "expression": "I*S*ai*beta*beta_scale",
-     "expression_mathml": "<apply><times/><ci>I</ci><ci>S</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
+     "expression": "I*V1*ai*beta*beta_scale",
+     "expression_mathml": "<apply><times/><ci>I</ci><ci>V1</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
     },
     {
      "target": "t3",
-     "expression": "I*S*ai*beta*beta_scale",
-     "expression_mathml": "<apply><times/><ci>I</ci><ci>S</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
+     "expression": "I*V2*ai*beta*beta_scale",
+     "expression_mathml": "<apply><times/><ci>I</ci><ci>V2</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
     },
     {
      "target": "t4",
@@ -1071,13 +1071,13 @@
     },
     {
      "target": "t10",
-     "expression": "IV*S*ai*beta*beta_scale",
-     "expression_mathml": "<apply><times/><ci>IV</ci><ci>S</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
+     "expression": "IV*V1*ai*beta*beta_scale",
+     "expression_mathml": "<apply><times/><ci>IV</ci><ci>V1</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
     },
     {
      "target": "t11",
-     "expression": "IV*S*ai*beta*beta_scale",
-     "expression_mathml": "<apply><times/><ci>IV</ci><ci>S</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
+     "expression": "IV*V2*ai*beta*beta_scale",
+     "expression_mathml": "<apply><times/><ci>IV</ci><ci>V2</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
     },
     {
      "target": "t12",
@@ -1111,13 +1111,13 @@
     },
     {
      "target": "t18",
-     "expression": "IR*S*ai*beta*beta_scale",
-     "expression_mathml": "<apply><times/><ci>IR</ci><ci>S</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
+     "expression": "IR*V1*ai*beta*beta_scale",
+     "expression_mathml": "<apply><times/><ci>IR</ci><ci>V1</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
     },
     {
      "target": "t19",
-     "expression": "IR*S*ai*beta*beta_scale",
-     "expression_mathml": "<apply><times/><ci>IR</ci><ci>S</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
+     "expression": "IR*V2*ai*beta*beta_scale",
+     "expression_mathml": "<apply><times/><ci>IR</ci><ci>V2</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
     },
     {
      "target": "t20",
@@ -1151,13 +1151,13 @@
     },
     {
      "target": "t26",
-     "expression": "A*S*ai*ai_beta_ratio*beta*beta_scale",
-     "expression_mathml": "<apply><times/><ci>A</ci><ci>S</ci><ci>ai_beta_ratio</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
+     "expression": "A*V1*ai*ai_beta_ratio*beta*beta_scale",
+     "expression_mathml": "<apply><times/><ci>A</ci><ci>V1</ci><ci>ai_beta_ratio</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
     },
     {
      "target": "t27",
-     "expression": "A*S*ai*ai_beta_ratio*beta*beta_scale",
-     "expression_mathml": "<apply><times/><ci>A</ci><ci>S</ci><ci>ai_beta_ratio</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
+     "expression": "A*V2*ai*ai_beta_ratio*beta*beta_scale",
+     "expression_mathml": "<apply><times/><ci>A</ci><ci>V2</ci><ci>ai_beta_ratio</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
     },
     {
      "target": "t28",
@@ -1191,13 +1191,13 @@
     },
     {
      "target": "t34",
-     "expression": "AR*S*ai*ai_beta_ratio*beta*beta_scale",
-     "expression_mathml": "<apply><times/><ci>AR</ci><ci>S</ci><ci>ai_beta_ratio</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
+     "expression": "AR*V1*ai*ai_beta_ratio*beta*beta_scale",
+     "expression_mathml": "<apply><times/><ci>AR</ci><ci>V1</ci><ci>ai_beta_ratio</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
     },
     {
      "target": "t35",
-     "expression": "AR*S*ai*ai_beta_ratio*beta*beta_scale",
-     "expression_mathml": "<apply><times/><ci>AR</ci><ci>S</ci><ci>ai_beta_ratio</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
+     "expression": "AR*V2*ai*ai_beta_ratio*beta*beta_scale",
+     "expression_mathml": "<apply><times/><ci>AR</ci><ci>V2</ci><ci>ai_beta_ratio</ci><ci>ai</ci><ci>beta_scale</ci><ci>beta</ci></apply>"
     },
     {
      "target": "t36",