Fix controller of infection

Fixes #192
gyorilab · Jul 6, 2023 · d084a9a · d084a9a
1 parent 34488c0
commit d084a9a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 34 deletions.
diff --git a/notebooks/hackathon_2023.07/scenario1.ipynb b/notebooks/hackathon_2023.07/scenario1.ipynb
@@ -94,7 +94,7 @@
     "\n",
     "t1 = ControlledConversion(subject=c['S'],\n",
     "                          outcome=c['E'],\n",
-    "                          controller=c['E'],\n",
+    "                          controller=c['I'],\n",
     "                          rate_law=S*I*beta / N)\n",
     "t2 = NaturalConversion(subject=c['E'],\n",
     "                       outcome=c['I'],\n",

diff --git a/notebooks/hackathon_2023.07/scenario1_a.json b/notebooks/hackathon_2023.07/scenario1_a.json
@@ -20,8 +20,8 @@
     }
    },
    {
-    "id": "E",
-    "name": "E",
+    "id": "I",
+    "name": "I",
     "grounding": {
      "identifiers": {},
      "modifiers": {}
@@ -32,8 +32,8 @@
     }
    },
    {
-    "id": "I",
-    "name": "I",
+    "id": "E",
+    "name": "E",
     "grounding": {
      "identifiers": {},
      "modifiers": {}
@@ -72,11 +72,11 @@
    {
     "id": "t1",
     "input": [
-     "E",
+     "I",
      "S"
     ],
     "output": [
-     "E",
+     "I",
      "E"
     ],
     "properties": {
@@ -151,16 +151,16 @@
      "expression": "5599999.00000000",
      "expression_mathml": "<cn>5599999.0</cn>"
     },
-    {
-     "target": "E",
-     "expression": "1.00000000000000",
-     "expression_mathml": "<cn>1.0</cn>"
-    },
     {
      "target": "I",
      "expression": "0.0",
      "expression_mathml": "<cn>0.0</cn>"
     },
+    {
+     "target": "E",
+     "expression": "1.00000000000000",
+     "expression_mathml": "<cn>1.0</cn>"
+    },
     {
      "target": "R",
      "expression": "0.0",

diff --git a/notebooks/hackathon_2023.07/scenario1_c.json b/notebooks/hackathon_2023.07/scenario1_c.json
@@ -20,8 +20,8 @@
     }
    },
    {
-    "id": "E",
-    "name": "E",
+    "id": "I",
+    "name": "I",
     "grounding": {
      "identifiers": {},
      "modifiers": {}
@@ -32,8 +32,8 @@
     }
    },
    {
-    "id": "I",
-    "name": "I",
+    "id": "E",
+    "name": "E",
     "grounding": {
      "identifiers": {},
      "modifiers": {}
@@ -72,11 +72,11 @@
    {
     "id": "t1",
     "input": [
-     "E",
+     "I",
      "S"
     ],
     "output": [
-     "E",
+     "I",
      "E"
     ],
     "properties": {
@@ -151,16 +151,16 @@
      "expression": "5599999.00000000",
      "expression_mathml": "<cn>5599999.0</cn>"
     },
-    {
-     "target": "E",
-     "expression": "1.00000000000000",
-     "expression_mathml": "<cn>1.0</cn>"
-    },
     {
      "target": "I",
      "expression": "0.0",
      "expression_mathml": "<cn>0.0</cn>"
     },
+    {
+     "target": "E",
+     "expression": "1.00000000000000",
+     "expression_mathml": "<cn>1.0</cn>"
+    },
     {
      "target": "R",
      "expression": "0.0",

diff --git a/notebooks/hackathon_2023.07/scenario1_d.json b/notebooks/hackathon_2023.07/scenario1_d.json
@@ -20,8 +20,8 @@
     }
    },
    {
-    "id": "E",
-    "name": "E",
+    "id": "I",
+    "name": "I",
     "grounding": {
      "identifiers": {},
      "modifiers": {}
@@ -32,8 +32,8 @@
     }
    },
    {
-    "id": "I",
-    "name": "I",
+    "id": "E",
+    "name": "E",
     "grounding": {
      "identifiers": {},
      "modifiers": {}
@@ -72,11 +72,11 @@
    {
     "id": "t1",
     "input": [
-     "E",
+     "I",
      "S"
     ],
     "output": [
-     "E",
+     "I",
      "E"
     ],
     "properties": {
@@ -151,16 +151,16 @@
      "expression": "5599999.00000000",
      "expression_mathml": "<cn>5599999.0</cn>"
     },
-    {
-     "target": "E",
-     "expression": "1.00000000000000",
-     "expression_mathml": "<cn>1.0</cn>"
-    },
     {
      "target": "I",
      "expression": "0.0",
      "expression_mathml": "<cn>0.0</cn>"
     },
+    {
+     "target": "E",
+     "expression": "1.00000000000000",
+     "expression_mathml": "<cn>1.0</cn>"
+    },
     {
      "target": "R",
      "expression": "0.0",