diff --git a/demos/System_Dynamics/Compartment_Models/lab_notebook.ipynb b/demos/System_Dynamics/Compartment_Models/lab_notebook.ipynb
index dfa41bc..1fab435 100644
--- a/demos/System_Dynamics/Compartment_Models/lab_notebook.ipynb
+++ b/demos/System_Dynamics/Compartment_Models/lab_notebook.ipynb
@@ -129,7 +129,6 @@
},
{
"cell_type": "markdown",
- "metadata": {},
"source": [
"# SIR model\n",
"\n",
@@ -169,19 +168,13 @@
"In the first model built, the definition of parameters is up to the user and they are not time dependent, i.e., we have a deterministic and time-invariant system. This means that if we make a simulation with the same initial populations and parameters 100 times, we will get 100 equal results.\n",
"\n",
"Evidently, this is not how real world works and it will not allow us to reach our goal of creating multiple spread scenarios, so it's quite important that stochasticity is added to the model."
- ]
- },
- {
- "cell_type": "markdown",
- "metadata": {},
- "source": [
- "## SIR model stock and flow diagram\n",
- "Before properly building the model, it's essential to graphically represent it so that our problem is conceptually understood.\n",
- "\n",
- "The following stock and flow diagram shows how the information flows through the SIR model stocks of populations.\n",
- "\n",
- ""
- ]
+ ],
+ "metadata": {
+ "collapsed": false,
+ "pycharm": {
+ "name": "#%% md\n"
+ }
+ }
},
{
"cell_type": "markdown",
@@ -813,4 +806,4 @@
},
"nbformat": 4,
"nbformat_minor": 4
-}
+}
\ No newline at end of file
diff --git a/demos/System_Dynamics/prey_predator_sd/Predator_Prey_SD_model.ipynb b/demos/System_Dynamics/prey_predator_sd/Predator_Prey_SD_model.ipynb
index 52fdf48..40255e2 100644
--- a/demos/System_Dynamics/prey_predator_sd/Predator_Prey_SD_model.ipynb
+++ b/demos/System_Dynamics/prey_predator_sd/Predator_Prey_SD_model.ipynb
@@ -2,7 +2,11 @@
"cells": [
{
"cell_type": "markdown",
- "metadata": {},
+ "metadata": {
+ "pycharm": {
+ "name": "#%% md\n"
+ }
+ },
"source": [
"## Predator Prey Systems Dynamics modelling\n",
"\n",
@@ -22,7 +26,11 @@
{
"cell_type": "code",
"execution_count": 1,
- "metadata": {},
+ "metadata": {
+ "pycharm": {
+ "name": "#%%\n"
+ }
+ },
"outputs": [
{
"name": "stdout",
@@ -36,16 +44,14 @@
"\\___/\\__,_/\\__,_/\\____/_/ |_/_____/\n",
"by cadCAD\n",
"\n",
+ "cadCAD Version: 0.4.28\n",
"Execution Mode: local_proc\n",
- "Configuration Count: 1\n",
- "Dimensions of the first simulation: (Timesteps, Params, Runs, Vars) = (1000, 6, 1, 2)\n",
+ "Simulation Dimensions:\n",
+ "Entire Simulation: (Models, Unique Timesteps, Params, Total Runs, Sub-States) = (1, 1000, 6, 1, 2)\n",
+ " Simulation 0: (Timesteps, Params, Runs, Sub-States) = (1000, 6, 1, 2)\n",
"Execution Method: local_simulations\n",
- "SimIDs : [0]\n",
- "SubsetIDs: [0]\n",
- "Ns : [0]\n",
- "ExpIDs : [0]\n",
"Execution Mode: single_threaded\n",
- "Total execution time: 0.28s\n"
+ "Total execution time: 0.04s\n"
]
}
],
@@ -66,8 +72,12 @@
},
{
"cell_type": "code",
- "execution_count": null,
- "metadata": {},
+ "execution_count": 2,
+ "metadata": {
+ "pycharm": {
+ "name": "#%%\n"
+ }
+ },
"outputs": [],
"source": [
"# observe the dataset"
@@ -75,111 +85,19 @@
},
{
"cell_type": "code",
- "execution_count": 2,
- "metadata": {},
+ "execution_count": 3,
+ "metadata": {
+ "pycharm": {
+ "name": "#%%\n"
+ }
+ },
"outputs": [
{
"data": {
- "text/html": [
- "\n",
- "\n",
- "
\n",
- " \n",
- " \n",
- " | \n",
- " prey_population | \n",
- " predator_population | \n",
- " simulation | \n",
- " subset | \n",
- " run | \n",
- " substep | \n",
- " timestep | \n",
- "
\n",
- " \n",
- " \n",
- " \n",
- " | 1 | \n",
- " 103.00 | \n",
- " 48.00 | \n",
- " 0 | \n",
- " 0 | \n",
- " 1 | \n",
- " 1 | \n",
- " 1 | \n",
- "
\n",
- " \n",
- " | 2 | \n",
- " 106.00 | \n",
- " 46.00 | \n",
- " 0 | \n",
- " 0 | \n",
- " 1 | \n",
- " 1 | \n",
- " 2 | \n",
- "
\n",
- " \n",
- " | 3 | \n",
- " 109.00 | \n",
- " 44.00 | \n",
- " 0 | \n",
- " 0 | \n",
- " 1 | \n",
- " 1 | \n",
- " 3 | \n",
- "
\n",
- " \n",
- " | 4 | \n",
- " 112.00 | \n",
- " 42.00 | \n",
- " 0 | \n",
- " 0 | \n",
- " 1 | \n",
- " 1 | \n",
- " 4 | \n",
- "
\n",
- " \n",
- " | 5 | \n",
- " 115.00 | \n",
- " 40.00 | \n",
- " 0 | \n",
- " 0 | \n",
- " 1 | \n",
- " 1 | \n",
- " 5 | \n",
- "
\n",
- " \n",
- "
\n",
- "
\n\n
\n \n \n | \n prey_population | \n predator_population | \n simulation | \n subset | \n run | \n substep | \n timestep | \n
\n \n \n \n | 1 | \n 103.00 | \n 48.00 | \n 0 | \n 0 | \n 1 | \n 1 | \n 1 | \n
\n \n | 2 | \n 106.00 | \n 46.00 | \n 0 | \n 0 | \n 1 | \n 1 | \n 2 | \n
\n \n | 3 | \n 109.00 | \n 44.00 | \n 0 | \n 0 | \n 1 | \n 1 | \n 3 | \n
\n \n | 4 | \n 112.00 | \n 42.00 | \n 0 | \n 0 | \n 1 | \n 1 | \n 4 | \n
\n \n | 5 | \n 115.00 | \n 40.00 | \n 0 | \n 0 | \n 1 | \n 1 | \n 5 | \n
\n \n
\n