diff --git a/examples/full_fledged_schema_examples_new/stratification/diabetes_diagnose.ipynb b/examples/full_fledged_schema_examples_new/stratification/diabetes_diagnose.ipynb
index e6df577d..def7b20b 100644
--- a/examples/full_fledged_schema_examples_new/stratification/diabetes_diagnose.ipynb
+++ b/examples/full_fledged_schema_examples_new/stratification/diabetes_diagnose.ipynb
@@ -2,7 +2,25 @@
"cells": [
{
"cell_type": "code",
- "execution_count": 1,
+ "execution_count": 2,
+ "metadata": {},
+ "outputs": [
+ {
+ "name": "stderr",
+ "output_type": "stream",
+ "text": [
+ "\u001b[32m\u001b[1m Activating\u001b[22m\u001b[39m project at `~/Documents/Git/StockFlow.jl`\n"
+ ]
+ }
+ ],
+ "source": [
+ "using Pkg;\n",
+ "Pkg.activate(\"../../..\") # Use StockFlow's Project.toml to ensure correct Catlab and AlgebraicRewriting versions"
+ ]
+ },
+ {
+ "cell_type": "code",
+ "execution_count": 3,
"metadata": {},
"outputs": [],
"source": [
@@ -27,7 +45,7 @@
},
{
"cell_type": "code",
- "execution_count": 2,
+ "execution_count": 4,
"metadata": {},
"outputs": [
{
@@ -133,7 +151,7 @@
},
{
"cell_type": "code",
- "execution_count": 3,
+ "execution_count": 5,
"metadata": {},
"outputs": [
{
@@ -467,7 +485,7 @@
},
{
"cell_type": "code",
- "execution_count": 4,
+ "execution_count": 6,
"metadata": {},
"outputs": [
{
@@ -641,7 +659,7 @@
},
{
"cell_type": "code",
- "execution_count": 5,
+ "execution_count": 7,
"metadata": {},
"outputs": [
{
@@ -822,7 +840,7 @@
},
{
"cell_type": "code",
- "execution_count": 6,
+ "execution_count": 8,
"metadata": {},
"outputs": [
{
@@ -850,7 +868,7 @@
},
{
"cell_type": "code",
- "execution_count": 7,
+ "execution_count": 9,
"metadata": {},
"outputs": [],
"source": [
@@ -867,7 +885,7 @@
},
{
"cell_type": "code",
- "execution_count": 8,
+ "execution_count": 10,
"metadata": {},
"outputs": [
{
@@ -1308,7 +1326,7 @@
},
{
"cell_type": "code",
- "execution_count": 9,
+ "execution_count": 11,
"metadata": {},
"outputs": [
{
@@ -1577,7 +1595,7 @@
},
{
"cell_type": "code",
- "execution_count": 10,
+ "execution_count": 12,
"metadata": {},
"outputs": [
{
@@ -1608,7 +1626,7 @@
},
{
"cell_type": "code",
- "execution_count": 11,
+ "execution_count": 13,
"metadata": {},
"outputs": [],
"source": [
@@ -1617,7 +1635,7 @@
},
{
"cell_type": "code",
- "execution_count": 12,
+ "execution_count": 14,
"metadata": {},
"outputs": [
{
@@ -1893,7 +1911,7 @@
},
{
"cell_type": "code",
- "execution_count": 13,
+ "execution_count": 15,
"metadata": {},
"outputs": [
{
@@ -2029,7 +2047,7 @@
"
\n",
" 10 | \n",
" 10 | \n",
- " f_DiagnoseDiabeticWtComp | \n",
+ " f_DiagnoseDiabeticEarly | \n",
"
\n",
" \n",
" 11 | \n",
@@ -2059,7 +2077,7 @@
"
\n",
" \n",
" 3 | \n",
- " 10 | \n",
+ " 9 | \n",
" 2 | \n",
"
\n",
" \n",
@@ -2120,7 +2138,7 @@
"
\n",
" \n",
" 6 | \n",
- " 10 | \n",
+ " 9 | \n",
" 2 | \n",
"
\n",
" \n",
@@ -2463,7 +2481,7 @@
"│\u001b[1m 7 \u001b[0m│ 7 │ f_DeathDiabeticLate │\n",
"│\u001b[1m 8 \u001b[0m│ 8 │ f_DiagnosePreDiabetic │\n",
"│\u001b[1m 9 \u001b[0m│ 9 │ f_DiagnoseDiabeticWtComp │\n",
- "│\u001b[1m 10 \u001b[0m│ 10 │ f_DiagnoseDiabeticWtComp │\n",
+ "│\u001b[1m 10 \u001b[0m│ 10 │ f_DiagnoseDiabeticEarly │\n",
"│\u001b[1m 11 \u001b[0m│ 11 │ f_DiagnoseDiabeticLate │\n",
"└────┴────┴──────────────────────────┘\n",
"┌───┬─────┬────┐\n",
@@ -2471,7 +2489,7 @@
"├───┼─────┼────┤\n",
"│\u001b[1m 1 \u001b[0m│ 8 │ 1 │\n",
"│\u001b[1m 2 \u001b[0m│ 1 │ 2 │\n",
- "│\u001b[1m 3 \u001b[0m│ 10 │ 2 │\n",
+ "│\u001b[1m 3 \u001b[0m│ 9 │ 2 │\n",
"│\u001b[1m 4 \u001b[0m│ 3 │ 3 │\n",
"│\u001b[1m 5 \u001b[0m│ 10 │ 3 │\n",
"│\u001b[1m 6 \u001b[0m│ 5 │ 4 │\n",
@@ -2485,7 +2503,7 @@
"│\u001b[1m 3 \u001b[0m│ 8 │ 1 │\n",
"│\u001b[1m 4 \u001b[0m│ 3 │ 2 │\n",
"│\u001b[1m 5 \u001b[0m│ 4 │ 2 │\n",
- "│\u001b[1m 6 \u001b[0m│ 10 │ 2 │\n",
+ "│\u001b[1m 6 \u001b[0m│ 9 │ 2 │\n",
"│\u001b[1m 7 \u001b[0m│ 5 │ 3 │\n",
"│\u001b[1m 8 \u001b[0m│ 6 │ 3 │\n",
"│\u001b[1m 9 \u001b[0m│ 10 │ 3 │\n",
@@ -2609,7 +2627,7 @@
"\n",
" PreDiabetic => f_DiagnosePreDiabetic(v_DiagnosePreDiabetic) => PreDiabetic\n",
" DiabeticWtComp => f_DiagnoseDiabeticWtComp(v_DiagnoseDiabeticWtComp) => DiabeticWtComp\n",
- " DiabeticEarly => f_DiagnoseDiabeticWtComp(v_DiagnoseDiabeticEarly) => DiabeticEarly\n",
+ " DiabeticEarly => f_DiagnoseDiabeticEarly(v_DiagnoseDiabeticEarly) => DiabeticEarly\n",
" DiabeticLate => f_DiagnoseDiabeticLate(v_DiagnoseDiabeticLate) => DiabeticLate\n",
"\n",
" :sums\n",
@@ -2620,7 +2638,7 @@
},
{
"cell_type": "code",
- "execution_count": 14,
+ "execution_count": 16,
"metadata": {},
"outputs": [
{
@@ -2653,7 +2671,7 @@
},
{
"cell_type": "code",
- "execution_count": 15,
+ "execution_count": 17,
"metadata": {},
"outputs": [],
"source": [
@@ -2662,7 +2680,7 @@
},
{
"cell_type": "code",
- "execution_count": 16,
+ "execution_count": 18,
"metadata": {},
"outputs": [
{
@@ -2674,497 +2692,513 @@
"\n",
"\n",
- "