From 715aaf7d2e512b28936c4057049a2754ee4ffb2d Mon Sep 17 00:00:00 2001 From: markus Date: Tue, 20 Oct 2020 11:27:51 +0200 Subject: [PATCH 01/18] create covid-calculator.ipynb --- app/covid-calculator.ipynb | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 app/covid-calculator.ipynb diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb new file mode 100644 index 00000000..f5746948 --- /dev/null +++ b/app/covid-calculator.ipynb @@ -0,0 +1,36 @@ +{ + "cells": [ + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "collapsed": true + }, + "outputs": [], + "source": [ + "" + ] + } + ], + "metadata": { + "kernelspec": { + "display_name": "Python 3", + "language": "python", + "name": "python3" + }, + "language_info": { + "codemirror_mode": { + "name": "ipython", + "version": 2 + }, + "file_extension": ".py", + "mimetype": "text/x-python", + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython2", + "version": "2.7.6" + } + }, + "nbformat": 4, + "nbformat_minor": 0 +} \ No newline at end of file From 549cc7cbc29abd1b2d848cba20564f4b2113e7d4 Mon Sep 17 00:00:00 2001 From: markus Date: Tue, 20 Oct 2020 11:47:07 +0200 Subject: [PATCH 02/18] import ipywidgets --- app/covid-calculator.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index f5746948..e0d61f35 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -8,7 +8,7 @@ }, "outputs": [], "source": [ - "" + "import ipywidgets as widgets" ] } ], From aa229f4fb40d4c2302d0a1a317bfc7cb7a695eba Mon Sep 17 00:00:00 2001 From: markus Date: Wed, 21 Oct 2020 15:26:05 +0200 Subject: [PATCH 03/18] add intro section, but descriptions are cut off --- app/cara.ipynb | 2 +- app/covid-calculator.ipynb | 45 ++++++++++++++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/app/cara.ipynb b/app/cara.ipynb index 906bf165..37a7cb0e 100644 --- a/app/cara.ipynb +++ b/app/cara.ipynb @@ -288,4 +288,4 @@ }, "nbformat": 4, "nbformat_minor": 4 -} +} \ No newline at end of file diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index e0d61f35..67ae19c1 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -2,14 +2,55 @@ "cells": [ { "cell_type": "code", - "execution_count": null, + "execution_count": 2, "metadata": { "collapsed": true }, "outputs": [], "source": [ - "import ipywidgets as widgets" + "from ipywidgets import Label, Layout, Text, VBox" ] + }, + { + "cell_type": "code", + "execution_count": 7, + "outputs": [ + { + "data": { + "text/plain": "VBox(children=(Label(value='CARA Covid Calculator', layout=Layout(width='100%')), Text(value='', description='…", + "application/vnd.jupyter.widget-view+json": { + "version_major": 2, + "version_minor": 0, + "model_id": "81c2850558b347f0b3040231351aba9f" + } + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "title = Label(\"CARA Covid Calculator\")\n", + "simulation_text = Text(\n", + " placeholder=\"E.g. Workshop without masks\",\n", + " description=\"Simulation name: \"\n", + ")\n", + "room_number_text = Text(\n", + " placeholder=\"E.g. 17/R-033\",\n", + " description=\"Room number: \"\n", + ")\n", + "\n", + "intro = VBox(\n", + " children=(title, simulation_text, room_number_text)\n", + ")\n", + "\n", + "intro\n" + ], + "metadata": { + "collapsed": false, + "pycharm": { + "name": "#%%\n" + } + } } ], "metadata": { From 5cf0c4787ff0ca7b3a894052fee68383bb99fb90 Mon Sep 17 00:00:00 2001 From: markus Date: Wed, 21 Oct 2020 15:52:21 +0200 Subject: [PATCH 04/18] use placeholder as prompt --- app/covid-calculator.ipynb | 55 ++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 23 deletions(-) diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index 67ae19c1..05c89adb 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -2,26 +2,31 @@ "cells": [ { "cell_type": "code", - "execution_count": 2, + "execution_count": 20, "metadata": { "collapsed": true }, "outputs": [], "source": [ - "from ipywidgets import Label, Layout, Text, VBox" + "import ipywidgets as w" ] }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 28, + "metadata": { + "pycharm": { + "name": "#%%\n" + } + }, "outputs": [ { "data": { - "text/plain": "VBox(children=(Label(value='CARA Covid Calculator', layout=Layout(width='100%')), Text(value='', description='…", + "text/plain": "VBox(children=(Label(value='CARA Covid Calculator'), Text(value='', placeholder='Simulation name'), Text(value…", "application/vnd.jupyter.widget-view+json": { "version_major": 2, "version_minor": 0, - "model_id": "81c2850558b347f0b3040231351aba9f" + "model_id": "9da199408f34408ca5ede050abe7858b" } }, "metadata": {}, @@ -29,22 +34,26 @@ } ], "source": [ - "title = Label(\"CARA Covid Calculator\")\n", - "simulation_text = Text(\n", - " placeholder=\"E.g. Workshop without masks\",\n", - " description=\"Simulation name: \"\n", - ")\n", - "room_number_text = Text(\n", - " placeholder=\"E.g. 17/R-033\",\n", - " description=\"Room number: \"\n", - ")\n", + "intro = w.VBox(children=(w.Label(\"CARA Covid Calculator\"),\n", + " w.Text(placeholder=\"Simulation name\"),\n", + " w.Text(placeholder=\"Room number\")))\n", "\n", - "intro = VBox(\n", - " children=(title, simulation_text, room_number_text)\n", - ")\n", - "\n", - "intro\n" + "intro" + ] + }, + { + "cell_type": "code", + "execution_count": 29, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Text(value='test', placeholder='Simulation name')\n" + ] + } ], + "source": [], "metadata": { "collapsed": false, "pycharm": { @@ -62,16 +71,16 @@ "language_info": { "codemirror_mode": { "name": "ipython", - "version": 2 + "version": 3 }, "file_extension": ".py", "mimetype": "text/x-python", "name": "python", "nbconvert_exporter": "python", - "pygments_lexer": "ipython2", - "version": "2.7.6" + "pygments_lexer": "ipython3", + "version": "3.8.5" } }, "nbformat": 4, - "nbformat_minor": 0 + "nbformat_minor": 1 } \ No newline at end of file From f308c9d287319b12695296330283c7390f146cb8 Mon Sep 17 00:00:00 2001 From: markus Date: Wed, 21 Oct 2020 15:58:06 +0200 Subject: [PATCH 05/18] use HTML for title --- app/covid-calculator.ipynb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index 05c89adb..c1af3153 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -13,7 +13,7 @@ }, { "cell_type": "code", - "execution_count": 28, + "execution_count": 31, "metadata": { "pycharm": { "name": "#%%\n" @@ -22,11 +22,11 @@ "outputs": [ { "data": { - "text/plain": "VBox(children=(Label(value='CARA Covid Calculator'), Text(value='', placeholder='Simulation name'), Text(value…", + "text/plain": "VBox(children=(HTML(value='CARA Covid Calculator'), Text(value='', placeholder='…", "application/vnd.jupyter.widget-view+json": { "version_major": 2, "version_minor": 0, - "model_id": "9da199408f34408ca5ede050abe7858b" + "model_id": "10803f4b11064714b63f45f2e23cc902" } }, "metadata": {}, @@ -34,7 +34,7 @@ } ], "source": [ - "intro = w.VBox(children=(w.Label(\"CARA Covid Calculator\"),\n", + "intro = w.VBox(children=(w.HTML(value='CARA Covid Calculator'),\n", " w.Text(placeholder=\"Simulation name\"),\n", " w.Text(placeholder=\"Room number\")))\n", "\n", From ba257465c4a50fc306ad3444876f1b32d587ff8c Mon Sep 17 00:00:00 2001 From: markus Date: Wed, 21 Oct 2020 16:42:10 +0200 Subject: [PATCH 06/18] unfinished room parameter input --- app/cara.ipynb | 56 ++++++++++++++++++++++---------------- app/covid-calculator.ipynb | 50 +++++++++++++++++++++------------- 2 files changed, 64 insertions(+), 42 deletions(-) diff --git a/app/cara.ipynb b/app/cara.ipynb index 37a7cb0e..34610701 100644 --- a/app/cara.ipynb +++ b/app/cara.ipynb @@ -15,7 +15,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 2, "metadata": {}, "outputs": [], "source": [ @@ -28,9 +28,21 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 9, "metadata": {}, - "outputs": [], + "outputs": [ + { + "ename": "ModuleNotFoundError", + "evalue": "No module named 'cara'", + "output_type": "error", + "traceback": [ + "\u001B[0;31m---------------------------------------------------------------------------\u001B[0m", + "\u001B[0;31mModuleNotFoundError\u001B[0m Traceback (most recent call last)", + "\u001B[0;32m\u001B[0m in \u001B[0;36m\u001B[0;34m\u001B[0m\n\u001B[0;32m----> 1\u001B[0;31m \u001B[0;32mimport\u001B[0m \u001B[0mcara\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mmodels\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 2\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 3\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 4\u001B[0m \u001B[0;32mdef\u001B[0m \u001B[0mprepare_model\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mvolume\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mn_infected\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;36m1\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mn_exposed\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;36m10\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mmask\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;34m'Type I'\u001B[0m\u001B[0;34m)\u001B[0m \u001B[0;34m->\u001B[0m \u001B[0mcara\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mmodels\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mModel\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 5\u001B[0m \"\"\"\n", + "\u001B[0;31mModuleNotFoundError\u001B[0m: No module named 'cara'" + ] + } + ], "source": [ "import cara.models\n", "\n", @@ -59,7 +71,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 10, "metadata": {}, "outputs": [], "source": [ @@ -70,7 +82,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 11, "metadata": {}, "outputs": [], "source": [ @@ -93,13 +105,13 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 12, "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "eb109c0f63e149d69e763aec5d404db2", + "model_id": "f18dd83234d345e39f3e841dec017ff8", "version_major": 2, "version_minor": 0 }, @@ -125,13 +137,13 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 13, "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "49ad604786f546f58dba54f1f6e7eded", + "model_id": "45619847b1a9413f8c864775e597d515", "version_major": 2, "version_minor": 0 }, @@ -175,22 +187,20 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 14, "metadata": {}, "outputs": [ { - "data": { - "application/vnd.jupyter.widget-view+json": { - "model_id": "8e76a49d0212462d81200a3959dcd3ff", - "version_major": 2, - "version_minor": 0 - }, - "text/plain": [ - "Accordion(children=(VBox(children=(HBox(children=(Canvas(footer_visible=False, header_visible=False, toolbar=T…" - ] - }, - "metadata": {}, - "output_type": "display_data" + "ename": "NameError", + "evalue": "name 'prepare_model' is not defined", + "output_type": "error", + "traceback": [ + "\u001B[0;31m---------------------------------------------------------------------------\u001B[0m", + "\u001B[0;31mNameError\u001B[0m Traceback (most recent call last)", + "\u001B[0;32m\u001B[0m in \u001B[0;36m\u001B[0;34m\u001B[0m\n\u001B[1;32m 48\u001B[0m \u001B[0mobservable\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mobserve\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mplot_concentrations\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 49\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m---> 50\u001B[0;31m \u001B[0mplot_concentrations\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;36m1\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 51\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 52\u001B[0m \u001B[0mfig\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mcanvas\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mtoolbar_visible\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0;32mTrue\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", + "\u001B[0;32m\u001B[0m in \u001B[0;36mplot_concentrations\u001B[0;34m(_)\u001B[0m\n\u001B[1;32m 8\u001B[0m \u001B[0;32mdef\u001B[0m \u001B[0mplot_concentrations\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0m_\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 9\u001B[0m \u001B[0;32mglobal\u001B[0m \u001B[0mline\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m---> 10\u001B[0;31m \u001B[0mmodel\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mprepare_model\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mroom_volume\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mvalue\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 11\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 12\u001B[0m \u001B[0mts\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mnp\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0marange\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;36m0\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;36m10.\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;36m0.01\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", + "\u001B[0;31mNameError\u001B[0m: name 'prepare_model' is not defined" + ] } ], "source": [ @@ -283,7 +293,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.6.12" + "version": "3.8.5" } }, "nbformat": 4, diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index c1af3153..7ebab4c9 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -2,10 +2,8 @@ "cells": [ { "cell_type": "code", - "execution_count": 20, - "metadata": { - "collapsed": true - }, + "execution_count": 49, + "metadata": {}, "outputs": [], "source": [ "import ipywidgets as w" @@ -13,7 +11,7 @@ }, { "cell_type": "code", - "execution_count": 31, + "execution_count": 68, "metadata": { "pycharm": { "name": "#%%\n" @@ -26,7 +24,7 @@ "application/vnd.jupyter.widget-view+json": { "version_major": 2, "version_minor": 0, - "model_id": "10803f4b11064714b63f45f2e23cc902" + "model_id": "61c53e6d9b58415097dce93a3a0e96c7" } }, "metadata": {}, @@ -43,23 +41,37 @@ }, { "cell_type": "code", - "execution_count": 29, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Text(value='test', placeholder='Simulation name')\n" - ] - } - ], - "source": [], + "execution_count": 74, "metadata": { - "collapsed": false, "pycharm": { "name": "#%%\n" } - } + }, + "outputs": [ + { + "data": { + "text/plain": "VBox(children=(Text(value='', placeholder='Room volume (m³)'), Label(value='OR'), Text(value='', placeholder='…", + "application/vnd.jupyter.widget-view+json": { + "version_major": 2, + "version_minor": 0, + "model_id": "bea9900594a14d078ab222436b922b5e" + } + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "volume_text = w.Text(placeholder=\"Room volume (m³)\")\n", + "area_text = w.Text(placeholder=\"Room floor area (m²)\")\n", + "height_text = w.Text(placeholder=\"Room ceiling height (m²)\")\n", + "\n", + "w.jslink((volume_text, 'value'), (area_text, 'disabled'))\n", + "w.jslink((volume_text, 'value'), (height_text, 'disabled'))\n", + "w.jslink((area_text, 'value'), (volume_text, 'disabled'))\n", + "\n", + "w.VBox(children=(volume_text, w.Label(value=\"OR\"),area_text, height_text), layout=w.Layout(align_items='center'))" + ] } ], "metadata": { From bdf9614f6a5e895a9a3c7f6e65201123aba21716 Mon Sep 17 00:00:00 2001 From: markus Date: Thu, 22 Oct 2020 10:40:40 +0200 Subject: [PATCH 07/18] fix box for providing room dimensions --- app/covid-calculator.ipynb | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index 7ebab4c9..52ad5c35 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 49, + "execution_count": 4, "metadata": {}, "outputs": [], "source": [ @@ -11,7 +11,7 @@ }, { "cell_type": "code", - "execution_count": 68, + "execution_count": 5, "metadata": { "pycharm": { "name": "#%%\n" @@ -24,7 +24,7 @@ "application/vnd.jupyter.widget-view+json": { "version_major": 2, "version_minor": 0, - "model_id": "61c53e6d9b58415097dce93a3a0e96c7" + "model_id": "b6dfcf9858f24a84bf9bac4918b328a5" } }, "metadata": {}, @@ -41,36 +41,28 @@ }, { "cell_type": "code", - "execution_count": 74, + "execution_count": 20, "metadata": { "pycharm": { "name": "#%%\n" } }, - "outputs": [ - { - "data": { - "text/plain": "VBox(children=(Text(value='', placeholder='Room volume (m³)'), Label(value='OR'), Text(value='', placeholder='…", - "application/vnd.jupyter.widget-view+json": { - "version_major": 2, - "version_minor": 0, - "model_id": "bea9900594a14d078ab222436b922b5e" - } - }, - "metadata": {}, - "output_type": "display_data" - } - ], + "outputs": [], "source": [ "volume_text = w.Text(placeholder=\"Room volume (m³)\")\n", "area_text = w.Text(placeholder=\"Room floor area (m²)\")\n", "height_text = w.Text(placeholder=\"Room ceiling height (m²)\")\n", "\n", - "w.jslink((volume_text, 'value'), (area_text, 'disabled'))\n", - "w.jslink((volume_text, 'value'), (height_text, 'disabled'))\n", - "w.jslink((area_text, 'value'), (volume_text, 'disabled'))\n", + "room_dimensions_box = w.VBox(children=(volume_text, w.Label(value=\"------- OR -------\"),area_text, height_text),\n", + " layout=w.Layout(align_items='center'))\n", + "def manage_text_fields(b):\n", + " volume_text.disabled = bool(area_text.value) or bool(height_text.value)\n", + " area_text.disabled = bool(volume_text.value)\n", + " height_text.disabled = bool(volume_text.value)\n", "\n", - "w.VBox(children=(volume_text, w.Label(value=\"OR\"),area_text, height_text), layout=w.Layout(align_items='center'))" + "volume_text.observe(manage_text_fields)\n", + "area_text.observe(manage_text_fields)\n", + "height_text.observe(manage_text_fields)" ] } ], From 8cdd350157f6b800a9fce4043e4b6712fd124703 Mon Sep 17 00:00:00 2001 From: markus Date: Thu, 22 Oct 2020 10:49:49 +0200 Subject: [PATCH 08/18] use style to make enough room for description --- app/covid-calculator.ipynb | 43 ++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index 52ad5c35..15f4517d 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -11,7 +11,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 42, "metadata": { "pycharm": { "name": "#%%\n" @@ -20,11 +20,11 @@ "outputs": [ { "data": { - "text/plain": "VBox(children=(HTML(value='CARA Covid Calculator'), Text(value='', placeholder='…", + "text/plain": "VBox(children=(HTML(value='CARA Covid Calculator'), Text(value='', description='…", "application/vnd.jupyter.widget-view+json": { "version_major": 2, "version_minor": 0, - "model_id": "b6dfcf9858f24a84bf9bac4918b328a5" + "model_id": "cb4016cbd61a455780fd5b7d9b8585db" } }, "metadata": {}, @@ -33,25 +33,40 @@ ], "source": [ "intro = w.VBox(children=(w.HTML(value='CARA Covid Calculator'),\n", - " w.Text(placeholder=\"Simulation name\"),\n", - " w.Text(placeholder=\"Room number\")))\n", + " w.Text(placeholder=\"E.g. Workshop without masks\", description=\"Simulation name:\",\n", + " style={'description_width': '35%'}),\n", + " w.Text(placeholder=\"E.g. 17/R-033\", description=\"Room number:\",\n", + " style={'description_width': '35%'})))\n", "\n", "intro" ] }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 34, "metadata": { "pycharm": { "name": "#%%\n" } }, - "outputs": [], + "outputs": [ + { + "data": { + "text/plain": "VBox(children=(Text(value='', description='Room volume', placeholder='Room volume (m³)', style=DescriptionStyl…", + "application/vnd.jupyter.widget-view+json": { + "version_major": 2, + "version_minor": 0, + "model_id": "152f11e8cd014cd5847392b559a4424b" + } + }, + "metadata": {}, + "output_type": "display_data" + } + ], "source": [ - "volume_text = w.Text(placeholder=\"Room volume (m³)\")\n", - "area_text = w.Text(placeholder=\"Room floor area (m²)\")\n", - "height_text = w.Text(placeholder=\"Room ceiling height (m²)\")\n", + "volume_text = w.Text(placeholder=\"Room volume (m³)\", description=\"Room volume\")\n", + "area_text = w.Text(placeholder=\"Room floor area (m²)\", description=\"Floor area\")\n", + "height_text = w.Text(placeholder=\"Room ceiling height (m²)\", description=\"Ceiling height\")\n", "\n", "room_dimensions_box = w.VBox(children=(volume_text, w.Label(value=\"------- OR -------\"),area_text, height_text),\n", " layout=w.Layout(align_items='center'))\n", @@ -60,9 +75,15 @@ " area_text.disabled = bool(volume_text.value)\n", " height_text.disabled = bool(volume_text.value)\n", "\n", + "for text in [volume_text, area_text, height_text]:\n", + " text.observe(manage_text_fields)\n", + " text.style.description_width = \"50%\"\n", + "\n", "volume_text.observe(manage_text_fields)\n", "area_text.observe(manage_text_fields)\n", - "height_text.observe(manage_text_fields)" + "height_text.observe(manage_text_fields)\n", + "\n", + "room_dimensions_box" ] } ], From 5e3b5826cc342f7396f6f6721972cdc617cb2914 Mon Sep 17 00:00:00 2001 From: markus Date: Thu, 22 Oct 2020 11:35:21 +0200 Subject: [PATCH 09/18] add mechanical ventilation box --- app/covid-calculator.ipynb | 98 ++++++++++++++++++++++---------------- 1 file changed, 57 insertions(+), 41 deletions(-) diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index 15f4517d..c6ede9cf 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 4, + "execution_count": 14, "metadata": {}, "outputs": [], "source": [ @@ -11,58 +11,30 @@ }, { "cell_type": "code", - "execution_count": 42, + "execution_count": 15, "metadata": { "pycharm": { "name": "#%%\n" } }, - "outputs": [ - { - "data": { - "text/plain": "VBox(children=(HTML(value='CARA Covid Calculator'), Text(value='', description='…", - "application/vnd.jupyter.widget-view+json": { - "version_major": 2, - "version_minor": 0, - "model_id": "cb4016cbd61a455780fd5b7d9b8585db" - } - }, - "metadata": {}, - "output_type": "display_data" - } - ], + "outputs": [], "source": [ - "intro = w.VBox(children=(w.HTML(value='CARA Covid Calculator'),\n", + "intro_box = w.VBox(children=(w.HTML(value='CARA Covid Calculator'),\n", " w.Text(placeholder=\"E.g. Workshop without masks\", description=\"Simulation name:\",\n", " style={'description_width': '35%'}),\n", " w.Text(placeholder=\"E.g. 17/R-033\", description=\"Room number:\",\n", - " style={'description_width': '35%'})))\n", - "\n", - "intro" + " style={'description_width': '35%'})))" ] }, { "cell_type": "code", - "execution_count": 34, + "execution_count": 16, "metadata": { "pycharm": { "name": "#%%\n" } }, - "outputs": [ - { - "data": { - "text/plain": "VBox(children=(Text(value='', description='Room volume', placeholder='Room volume (m³)', style=DescriptionStyl…", - "application/vnd.jupyter.widget-view+json": { - "version_major": 2, - "version_minor": 0, - "model_id": "152f11e8cd014cd5847392b559a4424b" - } - }, - "metadata": {}, - "output_type": "display_data" - } - ], + "outputs": [], "source": [ "volume_text = w.Text(placeholder=\"Room volume (m³)\", description=\"Room volume\")\n", "area_text = w.Text(placeholder=\"Room floor area (m²)\", description=\"Floor area\")\n", @@ -70,20 +42,64 @@ "\n", "room_dimensions_box = w.VBox(children=(volume_text, w.Label(value=\"------- OR -------\"),area_text, height_text),\n", " layout=w.Layout(align_items='center'))\n", - "def manage_text_fields(b):\n", + "def manage_room_text_fields(_):\n", " volume_text.disabled = bool(area_text.value) or bool(height_text.value)\n", " area_text.disabled = bool(volume_text.value)\n", " height_text.disabled = bool(volume_text.value)\n", "\n", "for text in [volume_text, area_text, height_text]:\n", - " text.observe(manage_text_fields)\n", + " text.observe(manage_room_text_fields)\n", " text.style.description_width = \"50%\"\n", "\n", - "volume_text.observe(manage_text_fields)\n", - "area_text.observe(manage_text_fields)\n", - "height_text.observe(manage_text_fields)\n", + "volume_text.observe(manage_room_text_fields)\n", + "area_text.observe(manage_room_text_fields)\n", + "height_text.observe(manage_room_text_fields)" + ] + }, + { + "cell_type": "code", + "execution_count": 22, + "metadata": { + "pycharm": { + "name": "#%%\n" + } + }, + "outputs": [ + { + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "a33e789cd87f4cff829c098073adcb4e", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "VBox(children=(ToggleButton(value=False, description='Mechanical ventilation', layout=Layout(width='100%')), T…" + ] + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "mechanical_button = w.ToggleButton(value=False, description='Mechanical ventilation', layout={'width': '100%'})\n", + "acph_text = w.Text(description=\"Air changes per hour\", style={'description_width': 'aut'})\n", + "asfr_text = w.Text(description=\"Air supply flow rate\", style={'description_width': '45%'})\n", "\n", - "room_dimensions_box" + "def toggle_mechanical(b: w.Button):\n", + " acph_text.disabled = not (mechanical_button.value or asfr_text.value)\n", + " asfr_text.disabled = not (mechanical_button.value or acph_text.value)\n", + "\n", + "w.jsdlink((acph_text, 'value'), (asfr_text, 'disabled'))\n", + "w.jsdlink((asfr_text, 'value'), (acph_text, 'disabled'))\n", + "acph_text.disabled = True\n", + "asfr_text.disabled = True\n", + "\n", + "mechanical_button.observe(toggle_mechanical)\n", + "\n", + "mech_vent_box = w.VBox(\n", + " children=(mechanical_button, acph_text, w.Label(value=\"------- OR -------\"), asfr_text),\n", + " layout=w.Layout(align_items='center')\n", + ")" ] } ], From 3e3c0af9d7e8d9f8141a211de3c221ffacefcdff Mon Sep 17 00:00:00 2001 From: markus Date: Thu, 22 Oct 2020 15:41:52 +0200 Subject: [PATCH 10/18] add ventilation menu --- app/covid-calculator.ipynb | 87 +++++++++++++++++++++++++++++--------- 1 file changed, 67 insertions(+), 20 deletions(-) diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index c6ede9cf..30531563 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -58,7 +58,7 @@ }, { "cell_type": "code", - "execution_count": 22, + "execution_count": 145, "metadata": { "pycharm": { "name": "#%%\n" @@ -67,40 +67,87 @@ "outputs": [ { "data": { + "text/plain": "VBox(children=(VBox(children=(Label(value='Ventilation type:'), HBox(children=(ToggleButton(value=False, descr…", "application/vnd.jupyter.widget-view+json": { - "model_id": "a33e789cd87f4cff829c098073adcb4e", "version_major": 2, - "version_minor": 0 - }, - "text/plain": [ - "VBox(children=(ToggleButton(value=False, description='Mechanical ventilation', layout=Layout(width='100%')), T…" - ] + "version_minor": 0, + "model_id": "ac7739af0c0d456db756d4844a8f1b41" + } }, "metadata": {}, "output_type": "display_data" } ], "source": [ - "mechanical_button = w.ToggleButton(value=False, description='Mechanical ventilation', layout={'width': '100%'})\n", - "acph_text = w.Text(description=\"Air changes per hour\", style={'description_width': 'aut'})\n", - "asfr_text = w.Text(description=\"Air supply flow rate\", style={'description_width': '45%'})\n", + "ventilation_label = w.Label(\"Ventilation type:\")\n", + "mechanical_button = w.ToggleButton(value=False, description='Mechanical', layout={'width': 'auto'})\n", + "natural_button = w.ToggleButton(value=False, description='Natural', layout={'width': 'auto'})\n", "\n", - "def toggle_mechanical(b: w.Button):\n", - " acph_text.disabled = not (mechanical_button.value or asfr_text.value)\n", - " asfr_text.disabled = not (mechanical_button.value or acph_text.value)\n", + "acph_text = w.Text(description=\"Air changes per hour\", style={'description_width': 'auto'})\n", + "asfr_text = w.Text(description=\"Air supply flow rate\", style={'description_width': 'auto'})\n", "\n", "w.jsdlink((acph_text, 'value'), (asfr_text, 'disabled'))\n", "w.jsdlink((asfr_text, 'value'), (acph_text, 'disabled'))\n", - "acph_text.disabled = True\n", - "asfr_text.disabled = True\n", - "\n", - "mechanical_button.observe(toggle_mechanical)\n", "\n", "mech_vent_box = w.VBox(\n", - " children=(mechanical_button, acph_text, w.Label(value=\"------- OR -------\"), asfr_text),\n", - " layout=w.Layout(align_items='center')\n", - ")" + " children=(acph_text, w.Label(value=\"------- OR -------\"), asfr_text),\n", + " layout=w.Layout(display='none')\n", + ")\n", + "\n", + "nat_vent_box = w.VBox(\n", + " children=(\n", + " w.Text(description='Number of windows:', style={'description_width': 'auto'}),\n", + " w.Text(description='Height of window:', placeholder='meters', style={'description_width': 'auto'}),\n", + " w.Text(description='Width of window:', placeholder='meters', style={'description_width': 'auto'}),\n", + " w.Text(description='Opening distance:', placeholder='centimeters', style={'description_width': 'auto'}),\n", + " w.HBox(children=(\n", + " w.Label('Windows open'),\n", + " w.RadioButtons(options=('Always', '15 min / 2h'))\n", + " ))\n", + " ),\n", + " layout=w.Layout(align_items='center', display='none'),\n", + ")\n", + "\n", + "\n", + "\n", + "tab_bar = w.HBox(children=(mechanical_button, natural_button))\n", + "ventilation_type_menu = w.VBox(children=(ventilation_label, tab_bar), layout=w.Layout(align_items='center', width='auto'))\n", + "ventilation_menu = w.VBox(children=(ventilation_type_menu, mech_vent_box, nat_vent_box),\n", + " layout=w.Layout(align_items='center'))\n", + "\n", + "def handle_natural_toggle(_):\n", + " if natural_button.value:\n", + " mechanical_button.value = False\n", + " ventilation_menu.children[2].layout.display = 'block'\n", + " else:\n", + " ventilation_menu.children[2].layout.display = 'none'\n", + "\n", + "def handle_mechanical_toggle(_):\n", + " if mechanical_button.value:\n", + " natural_button.value = False\n", + " ventilation_menu.children[1].layout.display = 'block'\n", + " else:\n", + " ventilation_menu.children[1].layout.display = 'none'\n", + "\n", + "natural_button.observe(handle_natural_toggle)\n", + "mechanical_button.observe(handle_mechanical_toggle)\n", + "\n", + "ventilation_menu" ] + }, + { + "cell_type": "code", + "execution_count": null, + "outputs": [], + "source": [ + "natural_button = w.ToggleButton(value=False, description='Mechanical ventilation', layout={'width': '100%'})\n" + ], + "metadata": { + "collapsed": false, + "pycharm": { + "name": "#%%\n" + } + } } ], "metadata": { From 786524a8eb5d3534b1fb4835799227ac1b3254b7 Mon Sep 17 00:00:00 2001 From: markus Date: Thu, 22 Oct 2020 16:24:15 +0200 Subject: [PATCH 11/18] add padding between boxes --- app/covid-calculator.ipynb | 77 +++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 39 deletions(-) diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index 30531563..44fef497 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 14, + "execution_count": 1, "metadata": {}, "outputs": [], "source": [ @@ -11,7 +11,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 2, "metadata": { "pycharm": { "name": "#%%\n" @@ -23,12 +23,13 @@ " w.Text(placeholder=\"E.g. Workshop without masks\", description=\"Simulation name:\",\n", " style={'description_width': '35%'}),\n", " w.Text(placeholder=\"E.g. 17/R-033\", description=\"Room number:\",\n", - " style={'description_width': '35%'})))" + " style={'description_width': '35%'})),\n", + " layout=w.Layout(padding='0px 0px 50px 0px'))" ] }, { "cell_type": "code", - "execution_count": 16, + "execution_count": 3, "metadata": { "pycharm": { "name": "#%%\n" @@ -41,7 +42,8 @@ "height_text = w.Text(placeholder=\"Room ceiling height (m²)\", description=\"Ceiling height\")\n", "\n", "room_dimensions_box = w.VBox(children=(volume_text, w.Label(value=\"------- OR -------\"),area_text, height_text),\n", - " layout=w.Layout(align_items='center'))\n", + " layout=w.Layout(padding='0px 0px 50px 0px'))\n", + "\n", "def manage_room_text_fields(_):\n", " volume_text.disabled = bool(area_text.value) or bool(height_text.value)\n", " area_text.disabled = bool(volume_text.value)\n", @@ -49,7 +51,7 @@ "\n", "for text in [volume_text, area_text, height_text]:\n", " text.observe(manage_room_text_fields)\n", - " text.style.description_width = \"50%\"\n", + " text.style.description_width = \"auto\"\n", "\n", "volume_text.observe(manage_room_text_fields)\n", "area_text.observe(manage_room_text_fields)\n", @@ -58,26 +60,13 @@ }, { "cell_type": "code", - "execution_count": 145, + "execution_count": 197, "metadata": { "pycharm": { "name": "#%%\n" } }, - "outputs": [ - { - "data": { - "text/plain": "VBox(children=(VBox(children=(Label(value='Ventilation type:'), HBox(children=(ToggleButton(value=False, descr…", - "application/vnd.jupyter.widget-view+json": { - "version_major": 2, - "version_minor": 0, - "model_id": "ac7739af0c0d456db756d4844a8f1b41" - } - }, - "metadata": {}, - "output_type": "display_data" - } - ], + "outputs": [], "source": [ "ventilation_label = w.Label(\"Ventilation type:\")\n", "mechanical_button = w.ToggleButton(value=False, description='Mechanical', layout={'width': 'auto'})\n", @@ -105,49 +94,59 @@ " w.RadioButtons(options=('Always', '15 min / 2h'))\n", " ))\n", " ),\n", - " layout=w.Layout(align_items='center', display='none'),\n", + " layout=w.Layout(display='none'),\n", ")\n", "\n", "\n", "\n", "tab_bar = w.HBox(children=(mechanical_button, natural_button))\n", - "ventilation_type_menu = w.VBox(children=(ventilation_label, tab_bar), layout=w.Layout(align_items='center', width='auto'))\n", - "ventilation_menu = w.VBox(children=(ventilation_type_menu, mech_vent_box, nat_vent_box),\n", - " layout=w.Layout(align_items='center'))\n", + "ventilation_type_menu = w.VBox(children=(ventilation_label, tab_bar), layout=w.Layout(padding='0px 0px 20px 0px'))\n", + "ventilation_box = w.VBox(children=(ventilation_type_menu, mech_vent_box, nat_vent_box),\n", + " layout=w.Layout(padding='0px 0px 50px 0px'))\n", "\n", "def handle_natural_toggle(_):\n", " if natural_button.value:\n", " mechanical_button.value = False\n", - " ventilation_menu.children[2].layout.display = 'block'\n", + " ventilation_box.children[2].layout.display = 'block'\n", " else:\n", - " ventilation_menu.children[2].layout.display = 'none'\n", + " ventilation_box.children[2].layout.display = 'none'\n", "\n", "def handle_mechanical_toggle(_):\n", " if mechanical_button.value:\n", " natural_button.value = False\n", - " ventilation_menu.children[1].layout.display = 'block'\n", + " ventilation_box.children[1].layout.display = 'block'\n", " else:\n", - " ventilation_menu.children[1].layout.display = 'none'\n", + " ventilation_box.children[1].layout.display = 'none'\n", "\n", "natural_button.observe(handle_natural_toggle)\n", - "mechanical_button.observe(handle_mechanical_toggle)\n", - "\n", - "ventilation_menu" + "mechanical_button.observe(handle_mechanical_toggle)" ] }, { "cell_type": "code", - "execution_count": null, - "outputs": [], - "source": [ - "natural_button = w.ToggleButton(value=False, description='Mechanical ventilation', layout={'width': '100%'})\n" - ], + "execution_count": 196, "metadata": { - "collapsed": false, "pycharm": { "name": "#%%\n" } - } + }, + "outputs": [ + { + "data": { + "text/plain": "VBox(children=(VBox(children=(HTML(value='CARA Covid Calculator'), Text(value=''…", + "application/vnd.jupyter.widget-view+json": { + "version_major": 2, + "version_minor": 0, + "model_id": "06f418553b6d45448e35303e41b1ebb7" + } + }, + "metadata": {}, + "output_type": "display_data" + } + ], + "source": [ + "w.VBox(children=(intro_box, room_dimensions_box, ventilation_box))" + ] } ], "metadata": { From 2a7fa5b106cb259d478ff608f1e09ffbe1ea88a5 Mon Sep 17 00:00:00 2001 From: markus Date: Mon, 26 Oct 2020 09:57:33 +0100 Subject: [PATCH 12/18] add elements for setting time, date and breaks --- app/covid-calculator.ipynb | 97 ++++++++++++++++++++++++++++++++++---- 1 file changed, 89 insertions(+), 8 deletions(-) diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index 44fef497..ca3b1030 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 1, + "execution_count": 2, "metadata": {}, "outputs": [], "source": [ @@ -11,7 +11,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 3, "metadata": { "pycharm": { "name": "#%%\n" @@ -29,7 +29,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 4, "metadata": { "pycharm": { "name": "#%%\n" @@ -60,7 +60,7 @@ }, { "cell_type": "code", - "execution_count": 197, + "execution_count": 5, "metadata": { "pycharm": { "name": "#%%\n" @@ -124,7 +124,7 @@ }, { "cell_type": "code", - "execution_count": 196, + "execution_count": 7, "metadata": { "pycharm": { "name": "#%%\n" @@ -133,11 +133,11 @@ "outputs": [ { "data": { - "text/plain": "VBox(children=(VBox(children=(HTML(value='CARA Covid Calculator'), Text(value=''…", + "text/plain": "VBox(children=(ToggleButton(value=False, description='Lunch break'), HBox(children=(VBox(children=(Label(value…", "application/vnd.jupyter.widget-view+json": { "version_major": 2, "version_minor": 0, - "model_id": "06f418553b6d45448e35303e41b1ebb7" + "model_id": "5998e5c52baa48b4af05c6c65acef726" } }, "metadata": {}, @@ -145,7 +145,88 @@ } ], "source": [ - "w.VBox(children=(intro_box, room_dimensions_box, ventilation_box))" + "event_data_label = w.Label(\"Event data:\")\n", + "attendees_label = w.Label(\"Attendees:\")\n", + "total_people_text = w.Text(description=\"Total number of people:\", style={'description_width': 'auto'})\n", + "infected_people_text = w.Text(description=\"Number of infected people:\", style={'description_width': 'auto'})\n", + "activity_dropdown = w.Dropdown(description=\"Activity type:\", options=[\"Training\", \"Workshop\", \"Office\"], value=None)\n", + "start_hour = w.Dropdown(options=[\"HH\"] + [(\"0\" + str(i)) if len(str(i)) == 1 else str(i) for i in range(24)], value=\"HH\")\n", + "start_minute = w.Dropdown(options=[\"MM\"] + [(\"0\" + str(i)) if len(str(i)) == 1 else str(i) for i in range(60)], value=\"MM\")\n", + "finish_hour = w.Dropdown(options=[\"HH\"] + [(\"0\" + str(i)) if len(str(i)) == 1 else str(i) for i in range(24)], value=\"HH\")\n", + "finish_minute = w.Dropdown(options=[\"MM\"] + [(\"0\" + str(i)) if len(str(i)) == 1 else str(i) for i in range(60)], value=\"MM\")\n", + "start_box = w.VBox(children=(w.Label(\"Start:\"),\n", + " w.HBox(children=(start_hour, start_minute))),\n", + " layout=w.Layout(padding=\"0px 20px 0px 0px\"))\n", + "finish_box = w.VBox(children=(w.Label(\"Finish:\"),\n", + " w.HBox(children=(finish_hour, finish_minute))))\n", + "event_time_box = w.HBox(children=(start_box, finish_box))\n", + "\n", + "event_intro_box = w.VBox(children=(\n", + " event_data_label,\n", + " attendees_label,\n", + " total_people_text,\n", + " infected_people_text,\n", + " activity_dropdown,\n", + " event_time_box\n", + "))\n", + "\n", + "months = (\"January\", \"February\", \"March\", \"April\", \"May\", \"June\",\n", + " \"July\", \"August\", \"September\", \"October\", \"November\", \"December\")\n", + "\n", + "single_button = w.ToggleButton(value=False, description='Single event', layout={'width': 'auto'})\n", + "recurrent_button = w.ToggleButton(value=False, description='Recurrent usage', layout={'width': 'auto'})\n", + "single_recurrent_selection_bar = w.HBox(children=(single_button, recurrent_button))\n", + "month_dropdown = w.Dropdown(options=months, value=None, description=\"Month:\", layout=w.Layout(padding=\"0px 20px 0px 0px\"))\n", + "day_dropdown = w.Dropdown(options=[i for i in range(1, 32)], value=None, description=\"Day:\")\n", + "date_selector = w.HBox(children=(month_dropdown, day_dropdown), layout=w.Layout(display='none'))\n", + "months_bar = w.HBox(children=[w.ToggleButton(value=False, description=month[0]) for month in months],\n", + " layout = w.Layout(display='none'))\n", + "\n", + "def handle_single_click(_):\n", + " if single_button.value:\n", + " date_selector.layout.display = 'contents'\n", + " recurrent_button.value = False\n", + " else:\n", + " date_selector.layout.display = 'none'\n", + "\n", + "def handle_recurrent_click(_):\n", + " if recurrent_button.value:\n", + " months_bar.layout.display = 'contents'\n", + " single_button.value = False\n", + " else:\n", + " months_bar.layout.display = 'none'\n", + "\n", + "single_button.observe(handle_single_click)\n", + "recurrent_button.observe(handle_recurrent_click)\n", + "\n", + "date_box = w.VBox(children=(w.HBox(children=(single_button, recurrent_button)),\n", + " w.HBox(children=(date_selector, months_bar))))\n", + "\n", + "lunch_start_hour = w.Dropdown(options=[\"HH\"] + [(\"0\" + str(i)) if len(str(i)) == 1 else str(i) for i in range(24)],\n", + " value=\"HH\", disabled=True)\n", + "lunch_start_minute = w.Dropdown(options=[\"MM\"] + [(\"0\" + str(i)) if len(str(i)) == 1 else str(i) for i in range(60)],\n", + " value=\"MM\", disabled=True)\n", + "lunch_finish_hour = w.Dropdown(options=[\"HH\"] + [(\"0\" + str(i)) if len(str(i)) == 1 else str(i) for i in range(24)],\n", + " value=\"HH\", disabled=True)\n", + "lunch_finish_minute = w.Dropdown(options=[\"MM\"] + [(\"0\" + str(i)) if len(str(i)) == 1 else str(i) for i in range(60)],\n", + " value=\"MM\", disabled=True)\n", + "lunch_start_box = w.VBox(children=(w.Label(\"Start:\"),\n", + " w.HBox(children=(lunch_start_hour, lunch_start_minute))),\n", + " layout=w.Layout(padding=\"0px 20px 0px 0px\"))\n", + "lunch_finish_box = w.VBox(children=(w.Label(\"Finish:\"),\n", + " w.HBox(children=(lunch_finish_minute, lunch_finish_minute))))\n", + "lunch_time_box = w.HBox(children=(lunch_start_box, lunch_finish_box))\n", + "\n", + "lunch_button = w.ToggleButton(value=False, description=\"Lunch break\")\n", + "\n", + "def handle_lunch(_):\n", + " for dropdown in (lunch_start_hour, lunch_start_minute, lunch_finish_hour, lunch_finish_minute):\n", + " dropdown.disabled = not lunch_button.value\n", + "\n", + "lunch_button.observe(handle_lunch)\n", + "\n", + "break_box = w.VBox(children=(lunch_button, lunch_time_box))\n", + "\n" ] } ], From 5c907455e31cc76ebbd6c8820ac06fe2d27eab27 Mon Sep 17 00:00:00 2001 From: markus Date: Tue, 27 Oct 2020 10:22:13 +0100 Subject: [PATCH 13/18] preliminary notebook complete --- app/covid-calculator.ipynb | 183 ++++++++++++++++++++++++++----------- 1 file changed, 131 insertions(+), 52 deletions(-) diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index ca3b1030..f353483b 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 2, + "execution_count": 56, "metadata": {}, "outputs": [], "source": [ @@ -11,7 +11,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 57, "metadata": { "pycharm": { "name": "#%%\n" @@ -21,15 +21,15 @@ "source": [ "intro_box = w.VBox(children=(w.HTML(value='CARA Covid Calculator'),\n", " w.Text(placeholder=\"E.g. Workshop without masks\", description=\"Simulation name:\",\n", - " style={'description_width': '35%'}),\n", + " style={'description_width': 'auto'}, layout=w.Layout(width='auto')),\n", " w.Text(placeholder=\"E.g. 17/R-033\", description=\"Room number:\",\n", - " style={'description_width': '35%'})),\n", + " style={'description_width': 'auto'}, layout=w.Layout(width='auto'))),\n", " layout=w.Layout(padding='0px 0px 50px 0px'))" ] }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 58, "metadata": { "pycharm": { "name": "#%%\n" @@ -37,9 +37,9 @@ }, "outputs": [], "source": [ - "volume_text = w.Text(placeholder=\"Room volume (m³)\", description=\"Room volume\")\n", - "area_text = w.Text(placeholder=\"Room floor area (m²)\", description=\"Floor area\")\n", - "height_text = w.Text(placeholder=\"Room ceiling height (m²)\", description=\"Ceiling height\")\n", + "volume_text = w.Text(placeholder=\"Room volume (m³)\", description=\"Room volume\", layout=w.Layout(width='auto'))\n", + "area_text = w.Text(placeholder=\"Room floor area (m²)\", description=\"Floor area\", layout=w.Layout(width='auto'))\n", + "height_text = w.Text(placeholder=\"Room ceiling height (m²)\", description=\"Ceiling height\", layout=w.Layout(width='auto'))\n", "\n", "room_dimensions_box = w.VBox(children=(volume_text, w.Label(value=\"------- OR -------\"),area_text, height_text),\n", " layout=w.Layout(padding='0px 0px 50px 0px'))\n", @@ -60,7 +60,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 59, "metadata": { "pycharm": { "name": "#%%\n" @@ -72,29 +72,32 @@ "mechanical_button = w.ToggleButton(value=False, description='Mechanical', layout={'width': 'auto'})\n", "natural_button = w.ToggleButton(value=False, description='Natural', layout={'width': 'auto'})\n", "\n", - "acph_text = w.Text(description=\"Air changes per hour\", style={'description_width': 'auto'})\n", - "asfr_text = w.Text(description=\"Air supply flow rate\", style={'description_width': 'auto'})\n", + "acph_text = w.Text(description=\"Air changes per hour\", style={'description_width': 'auto'}, layout=w.Layout(width='auto'))\n", + "asfr_text = w.Text(description=\"Air supply flow rate\", style={'description_width': 'auto'}, layout=w.Layout(width='auto'))\n", "\n", "w.jsdlink((acph_text, 'value'), (asfr_text, 'disabled'))\n", "w.jsdlink((asfr_text, 'value'), (acph_text, 'disabled'))\n", "\n", "mech_vent_box = w.VBox(\n", " children=(acph_text, w.Label(value=\"------- OR -------\"), asfr_text),\n", - " layout=w.Layout(display='none')\n", + " layout=w.Layout(display='none', width='auto')\n", ")\n", "\n", "nat_vent_box = w.VBox(\n", " children=(\n", - " w.Text(description='Number of windows:', style={'description_width': 'auto'}),\n", - " w.Text(description='Height of window:', placeholder='meters', style={'description_width': 'auto'}),\n", - " w.Text(description='Width of window:', placeholder='meters', style={'description_width': 'auto'}),\n", - " w.Text(description='Opening distance:', placeholder='centimeters', style={'description_width': 'auto'}),\n", + " w.Text(description='Number of windows:', style={'description_width': 'auto'}, layout=w.Layout(width='auto')),\n", + " w.Text(description='Height of window:', placeholder='meters', style={'description_width': 'auto'},\n", + " layout=w.Layout(width='auto')),\n", + " w.Text(description='Width of window:', placeholder='meters', style={'description_width': 'auto'},\n", + " layout=w.Layout(width='auto')),\n", + " w.Text(description='Opening distance:', placeholder='centimeters', style={'description_width': 'auto'},\n", + " layout=w.Layout(width='auto')),\n", " w.HBox(children=(\n", - " w.Label('Windows open'),\n", - " w.RadioButtons(options=('Always', '15 min / 2h'))\n", + " w.Label('Windows open', layout=w.Layout(width='auto')),\n", + " w.RadioButtons(options=('Always', '15 min / 2h'), layout=w.Layout(width='auto'))\n", " ))\n", " ),\n", - " layout=w.Layout(display='none'),\n", + " layout=w.Layout(display='none', width='auto'),\n", ")\n", "\n", "\n", @@ -119,37 +122,30 @@ " ventilation_box.children[1].layout.display = 'none'\n", "\n", "natural_button.observe(handle_natural_toggle)\n", - "mechanical_button.observe(handle_mechanical_toggle)" + "mechanical_button.observe(handle_mechanical_toggle)\n", + "left_column = w.VBox(children=(intro_box, room_dimensions_box, ventilation_box),\n", + " layout=w.Layout(width='25%', padding=\"0px 20px 0px 0px\"))" ] }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 60, "metadata": { "pycharm": { "name": "#%%\n" - } + }, + "scrolled": false }, - "outputs": [ - { - "data": { - "text/plain": "VBox(children=(ToggleButton(value=False, description='Lunch break'), HBox(children=(VBox(children=(Label(value…", - "application/vnd.jupyter.widget-view+json": { - "version_major": 2, - "version_minor": 0, - "model_id": "5998e5c52baa48b4af05c6c65acef726" - } - }, - "metadata": {}, - "output_type": "display_data" - } - ], + "outputs": [], "source": [ "event_data_label = w.Label(\"Event data:\")\n", "attendees_label = w.Label(\"Attendees:\")\n", - "total_people_text = w.Text(description=\"Total number of people:\", style={'description_width': 'auto'})\n", - "infected_people_text = w.Text(description=\"Number of infected people:\", style={'description_width': 'auto'})\n", - "activity_dropdown = w.Dropdown(description=\"Activity type:\", options=[\"Training\", \"Workshop\", \"Office\"], value=None)\n", + "total_people_text = w.Text(description=\"Total number of people:\", style={'description_width': 'auto'},\n", + " layout=w.Layout(width='auto'))\n", + "infected_people_text = w.Text(description=\"Number of infected people:\", style={'description_width': 'auto'},\n", + " layout=w.Layout(width='auto'))\n", + "activity_dropdown = w.Dropdown(description=\"Activity type:\", options=[\"Training\", \"Workshop\", \"Office\"], value=None,\n", + " layout=w.Layout(width='auto'))\n", "start_hour = w.Dropdown(options=[\"HH\"] + [(\"0\" + str(i)) if len(str(i)) == 1 else str(i) for i in range(24)], value=\"HH\")\n", "start_minute = w.Dropdown(options=[\"MM\"] + [(\"0\" + str(i)) if len(str(i)) == 1 else str(i) for i in range(60)], value=\"MM\")\n", "finish_hour = w.Dropdown(options=[\"HH\"] + [(\"0\" + str(i)) if len(str(i)) == 1 else str(i) for i in range(24)], value=\"HH\")\n", @@ -159,16 +155,15 @@ " layout=w.Layout(padding=\"0px 20px 0px 0px\"))\n", "finish_box = w.VBox(children=(w.Label(\"Finish:\"),\n", " w.HBox(children=(finish_hour, finish_minute))))\n", - "event_time_box = w.HBox(children=(start_box, finish_box))\n", + "event_time_box = w.HBox(children=(start_box, finish_box), layout=w.Layout(width='auto'))\n", "\n", - "event_intro_box = w.VBox(children=(\n", - " event_data_label,\n", - " attendees_label,\n", - " total_people_text,\n", - " infected_people_text,\n", - " activity_dropdown,\n", - " event_time_box\n", - "))\n", + "event_intro_box = w.VBox(children=(event_data_label,\n", + " attendees_label,\n", + " total_people_text,\n", + " infected_people_text,\n", + " activity_dropdown,\n", + " event_time_box),\n", + " layout=w.Layout(padding=\"50px 0px 20px 0px\"))\n", "\n", "months = (\"January\", \"February\", \"March\", \"April\", \"May\", \"June\",\n", " \"July\", \"August\", \"September\", \"October\", \"November\", \"December\")\n", @@ -200,7 +195,8 @@ "recurrent_button.observe(handle_recurrent_click)\n", "\n", "date_box = w.VBox(children=(w.HBox(children=(single_button, recurrent_button)),\n", - " w.HBox(children=(date_selector, months_bar))))\n", + " w.HBox(children=(date_selector, months_bar))),\n", + " layout=w.Layout(padding=\"0px 0px 30px 0px\"))\n", "\n", "lunch_start_hour = w.Dropdown(options=[\"HH\"] + [(\"0\" + str(i)) if len(str(i)) == 1 else str(i) for i in range(24)],\n", " value=\"HH\", disabled=True)\n", @@ -215,7 +211,7 @@ " layout=w.Layout(padding=\"0px 20px 0px 0px\"))\n", "lunch_finish_box = w.VBox(children=(w.Label(\"Finish:\"),\n", " w.HBox(children=(lunch_finish_minute, lunch_finish_minute))))\n", - "lunch_time_box = w.HBox(children=(lunch_start_box, lunch_finish_box))\n", + "lunch_time_box = w.HBox(children=(lunch_start_box, lunch_finish_box), layout=w.Layout(width='auto'))\n", "\n", "lunch_button = w.ToggleButton(value=False, description=\"Lunch break\")\n", "\n", @@ -225,8 +221,91 @@ "\n", "lunch_button.observe(handle_lunch)\n", "\n", - "break_box = w.VBox(children=(lunch_button, lunch_time_box))\n", - "\n" + "lunch_break_box = w.VBox(children=(lunch_button, lunch_time_box), layout=w.Layout(padding='0px 0px 20px 0px'))\n", + "\n", + "coffee_button = w.ToggleButton(value=False, description=\"Coffee breaks\")\n", + "coffee_breaks_text = w.Text(description=\"Number of breaks:\", disabled=True, style={'description_width': 'auto'},\n", + " layout=w.Layout(width='auto'))\n", + "coffee_duration = w.Dropdown(description=\"Duration:\", options=[\"MM\"] + [str(i) for i in range(1, 31)], value=\"MM\",\n", + " disabled=True, style={'description_width': 'auto'}, layout=w.Layout(width='auto'))\n", + "regular_breaks_label = w.Label(\"Regular breaks are spread evenly throughout the day\")\n", + "coffee_break_box = w.VBox(children=(coffee_button, coffee_breaks_text, coffee_duration, regular_breaks_label))\n", + "def handle_coffee_button(_):\n", + " coffee_duration.disabled = not coffee_button.value\n", + " coffee_breaks_text.disabled = not coffee_button.value\n", + "\n", + "coffee_button.observe(handle_coffee_button)\n", + "break_box = w.VBox(children=(lunch_break_box, coffee_break_box))\n", + "\n", + "middle_column = w.VBox(children=(event_intro_box, date_box, break_box),\n", + " layout=w.Layout(width='40%', padding='0px 20px 0px 0px'))" + ] + }, + { + "cell_type": "code", + "execution_count": 2, + "metadata": { + "pycharm": { + "name": "#%%\n" + } + }, + "outputs": [ + { + "ename": "NameError", + "evalue": "name 'w' is not defined", + "output_type": "error", + "traceback": [ + "\u001B[0;31m---------------------------------------------------------------------------\u001B[0m", + "\u001B[0;31mNameError\u001B[0m Traceback (most recent call last)", + "\u001B[0;32m\u001B[0m in \u001B[0;36m\u001B[0;34m\u001B[0m\n\u001B[0;32m----> 1\u001B[0;31m \u001B[0mmask_label\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mw\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mLabel\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;34m\"Mask wearing:\"\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 2\u001B[0m \u001B[0mmask_buttons\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mw\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mToggleButtons\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0moptions\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;34m[\u001B[0m\u001B[0;34m\"Continuous\"\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;34m\"Removed when seated >2m\"\u001B[0m\u001B[0;34m]\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 3\u001B[0m \u001B[0mmask_box\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mw\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mVBox\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mchildren\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mmask_label\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mmask_buttons\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mlayout\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0mw\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mLayout\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mpadding\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;34m'50px 0px 30px 0px'\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 4\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 5\u001B[0m info_box = w.HTML(value=''\n", + "\u001B[0;31mNameError\u001B[0m: name 'w' is not defined" + ] + } + ], + "source": [ + "mask_label = w.Label(\"Mask wearing:\")\n", + "mask_buttons = w.ToggleButtons(options=[\"Continuous\", \"Removed when seated >2m\"])\n", + "mask_box = w.VBox(children=(mask_label, mask_buttons), layout=w.Layout(padding='50px 0px 30px 0px'))\n", + "\n", + "info_box = w.HTML(value=''\n", + " '

This tool estimates the risk of COVID-19 spread. It is based on current scientific data and '\n", + " 'can be used to provide an illustration for different real world scenarios.


'\n", + " '

How to use this tool:

'\n", + " '

Room data

'\n", + " '

Enter the data about the area you wish to study. You can find these in GIS, or by measuring '\n", + " 'them yourself.

For mechanical ventilation, you should check with a specialist for the '\n", + " 'air flow or air change rate.


'\n", + " '

Event data

'\n", + " '

Enter the total number of people and how many you assume are infected.


'\n", + " '

Activity types:

'\n", + " '

Office = typical scenario all persons seated, talking quietly.

'\n", + " '

Workshop = assembly workshop environment, all persons doing light exercise, talking.

'\n", + " '

Training = one person standing, talking, all others seated, breathing normally.

'\n", + " '

Seminar = As training, but all participants take turns in standing and talking.

'\n", + " '

You should specify if the event is a one off (give date) or recurrent use of the same space '\n", + " 'for the same activity, in which case tick the months when the activity takes place.

'\n", + " '

Specify if a lunch break should be included, and when it starts/stops.

'\n", + " '

If you will take coffee breaks, they are spread out evenly throughout the day, '\n", + " 'in addition to lunch.

Mask wearing: Specify if they are worn all the time, '\n", + " 'or only when less than 2 meters apart.

',\n", + " layout=w.Layout(padding='0px 0px 30px 0px'))\n", + "\n", + "report_button = w.Button(description=\"Generate report\")\n", + "\n", + "right_column = w.VBox(children=(mask_box, info_box, report_button), layout=w.Layout(width='35%'))" + ] + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": { + "pycharm": { + "name": "#%%\n" + } + }, + "outputs": [], + "source": [ + "w.HBox(children=(left_column, middle_column, right_column))\n" ] } ], From afd6d4db58c919f802693b155bf797dee1bf2307 Mon Sep 17 00:00:00 2001 From: markus Date: Tue, 27 Oct 2020 10:43:07 +0100 Subject: [PATCH 14/18] fix double lunch-minute --- app/covid-calculator.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index f353483b..f085184b 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -210,7 +210,7 @@ " w.HBox(children=(lunch_start_hour, lunch_start_minute))),\n", " layout=w.Layout(padding=\"0px 20px 0px 0px\"))\n", "lunch_finish_box = w.VBox(children=(w.Label(\"Finish:\"),\n", - " w.HBox(children=(lunch_finish_minute, lunch_finish_minute))))\n", + " w.HBox(children=(lunch_finish_hour, lunch_finish_minute))))\n", "lunch_time_box = w.HBox(children=(lunch_start_box, lunch_finish_box), layout=w.Layout(width='auto'))\n", "\n", "lunch_button = w.ToggleButton(value=False, description=\"Lunch break\")\n", From ab8c0702ef8fb57d98d2853076a079aff204efe6 Mon Sep 17 00:00:00 2001 From: markus Date: Tue, 27 Oct 2020 11:51:49 +0100 Subject: [PATCH 15/18] add function for getting value --- app/covid-calculator.ipynb | 104 +++++++++++++++++++++++-------------- 1 file changed, 66 insertions(+), 38 deletions(-) diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index f085184b..4cfadddd 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 56, + "execution_count": 25, "metadata": {}, "outputs": [], "source": [ @@ -11,7 +11,7 @@ }, { "cell_type": "code", - "execution_count": 57, + "execution_count": 26, "metadata": { "pycharm": { "name": "#%%\n" @@ -19,17 +19,19 @@ }, "outputs": [], "source": [ + "name_text = w.Text(placeholder=\"E.g. Workshop without masks\", description=\"Simulation name:\",\n", + " style={'description_width': 'auto'}, layout=w.Layout(width='auto'))\n", + "room_number_text = w.Text(placeholder=\"E.g. 17/R-033\", description=\"Room number:\",\n", + " style={'description_width': 'auto'}, layout=w.Layout(width='auto'))\n", "intro_box = w.VBox(children=(w.HTML(value='CARA Covid Calculator'),\n", - " w.Text(placeholder=\"E.g. Workshop without masks\", description=\"Simulation name:\",\n", - " style={'description_width': 'auto'}, layout=w.Layout(width='auto')),\n", - " w.Text(placeholder=\"E.g. 17/R-033\", description=\"Room number:\",\n", - " style={'description_width': 'auto'}, layout=w.Layout(width='auto'))),\n", + " name_text,\n", + " room_number_text),\n", " layout=w.Layout(padding='0px 0px 50px 0px'))" ] }, { "cell_type": "code", - "execution_count": 58, + "execution_count": 27, "metadata": { "pycharm": { "name": "#%%\n" @@ -60,7 +62,7 @@ }, { "cell_type": "code", - "execution_count": 59, + "execution_count": 28, "metadata": { "pycharm": { "name": "#%%\n" @@ -83,18 +85,25 @@ " layout=w.Layout(display='none', width='auto')\n", ")\n", "\n", + "number_of_windows_text = w.Text(description='Number of windows:', style={'description_width': 'auto'},\n", + " layout=w.Layout(width='auto'))\n", + "height_of_window_text = w.Text(description='Height of window:', placeholder='meters',\n", + " style={'description_width': 'auto'}, layout=w.Layout(width='auto'))\n", + "width_of_window_text = w.Text(description='Width of window:', placeholder='meters', style={'description_width': 'auto'},\n", + " layout=w.Layout(width='auto'))\n", + "opening_distance_text = w.Text(description='Opening distance:', placeholder='centimeters', style={'description_width': 'auto'},\n", + " layout=w.Layout(width='auto'))\n", + "window_open_buttons = w.RadioButtons(options=('Always', '15 min / 2h'), layout=w.Layout(width='auto'))\n", + "\n", "nat_vent_box = w.VBox(\n", " children=(\n", - " w.Text(description='Number of windows:', style={'description_width': 'auto'}, layout=w.Layout(width='auto')),\n", - " w.Text(description='Height of window:', placeholder='meters', style={'description_width': 'auto'},\n", - " layout=w.Layout(width='auto')),\n", - " w.Text(description='Width of window:', placeholder='meters', style={'description_width': 'auto'},\n", - " layout=w.Layout(width='auto')),\n", - " w.Text(description='Opening distance:', placeholder='centimeters', style={'description_width': 'auto'},\n", - " layout=w.Layout(width='auto')),\n", + " number_of_windows_text,\n", + " opening_distance_text,\n", + " width_of_window_text,\n", + " opening_distance_text,\n", " w.HBox(children=(\n", " w.Label('Windows open', layout=w.Layout(width='auto')),\n", - " w.RadioButtons(options=('Always', '15 min / 2h'), layout=w.Layout(width='auto'))\n", + " window_open_buttons\n", " ))\n", " ),\n", " layout=w.Layout(display='none', width='auto'),\n", @@ -129,7 +138,7 @@ }, { "cell_type": "code", - "execution_count": 60, + "execution_count": 29, "metadata": { "pycharm": { "name": "#%%\n" @@ -165,8 +174,8 @@ " event_time_box),\n", " layout=w.Layout(padding=\"50px 0px 20px 0px\"))\n", "\n", - "months = (\"January\", \"February\", \"March\", \"April\", \"May\", \"June\",\n", - " \"July\", \"August\", \"September\", \"October\", \"November\", \"December\")\n", + "months = (\"january\", \"february\", \"march\", \"april\", \"may\", \"june\",\n", + " \"july\", \"august\", \"september\", \"october\", \"november\", \"december\")\n", "\n", "single_button = w.ToggleButton(value=False, description='Single event', layout={'width': 'auto'})\n", "recurrent_button = w.ToggleButton(value=False, description='Recurrent usage', layout={'width': 'auto'})\n", @@ -174,7 +183,8 @@ "month_dropdown = w.Dropdown(options=months, value=None, description=\"Month:\", layout=w.Layout(padding=\"0px 20px 0px 0px\"))\n", "day_dropdown = w.Dropdown(options=[i for i in range(1, 32)], value=None, description=\"Day:\")\n", "date_selector = w.HBox(children=(month_dropdown, day_dropdown), layout=w.Layout(display='none'))\n", - "months_bar = w.HBox(children=[w.ToggleButton(value=False, description=month[0]) for month in months],\n", + "\n", + "months_bar = w.HBox(children=[w.ToggleButton(value=False, description=month[0].upper()) for month in months],\n", " layout = w.Layout(display='none'))\n", "\n", "def handle_single_click(_):\n", @@ -243,25 +253,13 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 30, "metadata": { "pycharm": { "name": "#%%\n" } }, - "outputs": [ - { - "ename": "NameError", - "evalue": "name 'w' is not defined", - "output_type": "error", - "traceback": [ - "\u001B[0;31m---------------------------------------------------------------------------\u001B[0m", - "\u001B[0;31mNameError\u001B[0m Traceback (most recent call last)", - "\u001B[0;32m\u001B[0m in \u001B[0;36m\u001B[0;34m\u001B[0m\n\u001B[0;32m----> 1\u001B[0;31m \u001B[0mmask_label\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mw\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mLabel\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;34m\"Mask wearing:\"\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 2\u001B[0m \u001B[0mmask_buttons\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mw\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mToggleButtons\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0moptions\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;34m[\u001B[0m\u001B[0;34m\"Continuous\"\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;34m\"Removed when seated >2m\"\u001B[0m\u001B[0;34m]\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 3\u001B[0m \u001B[0mmask_box\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mw\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mVBox\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mchildren\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mmask_label\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mmask_buttons\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mlayout\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0mw\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mLayout\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mpadding\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;34m'50px 0px 30px 0px'\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 4\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 5\u001B[0m info_box = w.HTML(value=''\n", - "\u001B[0;31mNameError\u001B[0m: name 'w' is not defined" - ] - } - ], + "outputs": [], "source": [ "mask_label = w.Label(\"Mask wearing:\")\n", "mask_buttons = w.ToggleButtons(options=[\"Continuous\", \"Removed when seated >2m\"])\n", @@ -292,20 +290,50 @@ "\n", "report_button = w.Button(description=\"Generate report\")\n", "\n", - "right_column = w.VBox(children=(mask_box, info_box, report_button), layout=w.Layout(width='35%'))" + "right_column = w.VBox(children=(mask_box, info_box, report_button), layout=w.Layout(width='35%'))\n", + "\n", + "components = {'name_text', 'room_number_text', 'volume_text', 'area_text', 'height_text', 'mechanical_button',\n", + " 'acph_text', 'asfr_text', 'natural_button', 'number_of_windows_text', 'height_of_window_text',\n", + " 'width_of_window_text', 'opening_distance_text', 'opening_distance_text', 'window_open_buttons',\n", + " 'total_people_text', 'infected_people_text', 'activity_dropdown', 'start_hour', 'start_minute',\n", + " 'finish_hour', 'finish_minute', 'single_button', 'recurrent_button', 'month_dropdown', 'day_dropdown',\n", + " 'lunch_button', 'lunch_start_hour', 'lunch_start_minute', 'lunch_finish_hour', 'lunch_finish_minute',\n", + " 'coffee_button', 'coffee_breaks_text', 'coffee_duration', 'mask_buttons'}\n", + "components.update(set(months))\n", + "\n", + "def get_value(component_name: str):\n", + " assert component_name in components, f\"{component_name} is not the name of any UI-element with a value-attribute. \" \\\n", + " \"Valid names are:\\n\" + '\\n'.join(sorted(components))\n", + " if component_name in months:\n", + " return months_bar.children[months.index(component_name)].value\n", + "\n", + " return globals()[component_name].value" ] }, { "cell_type": "code", - "execution_count": null, + "execution_count": 31, "metadata": { "pycharm": { "name": "#%%\n" } }, - "outputs": [], + "outputs": [ + { + "data": { + "text/plain": "HBox(children=(VBox(children=(VBox(children=(HTML(value='CARA Covid Calculator')…", + "application/vnd.jupyter.widget-view+json": { + "version_major": 2, + "version_minor": 0, + "model_id": "3bc5f376c4884148be482783a874120a" + } + }, + "metadata": {}, + "output_type": "display_data" + } + ], "source": [ - "w.HBox(children=(left_column, middle_column, right_column))\n" + "w.HBox(children=(left_column, middle_column, right_column))" ] } ], From 5fdf55d9edd09124290dc0863d5290f70f43ea29 Mon Sep 17 00:00:00 2001 From: markus Date: Tue, 27 Oct 2020 15:16:14 +0100 Subject: [PATCH 16/18] padding tweaks --- app/covid-calculator.ipynb | 47 ++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index 4cfadddd..63367cf1 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 25, + "execution_count": 35, "metadata": {}, "outputs": [], "source": [ @@ -11,7 +11,7 @@ }, { "cell_type": "code", - "execution_count": 26, + "execution_count": 36, "metadata": { "pycharm": { "name": "#%%\n" @@ -31,7 +31,7 @@ }, { "cell_type": "code", - "execution_count": 27, + "execution_count": 37, "metadata": { "pycharm": { "name": "#%%\n" @@ -62,7 +62,7 @@ }, { "cell_type": "code", - "execution_count": 28, + "execution_count": 38, "metadata": { "pycharm": { "name": "#%%\n" @@ -119,14 +119,14 @@ "def handle_natural_toggle(_):\n", " if natural_button.value:\n", " mechanical_button.value = False\n", - " ventilation_box.children[2].layout.display = 'block'\n", + " ventilation_box.children[2].layout.display = 'contents'\n", " else:\n", " ventilation_box.children[2].layout.display = 'none'\n", "\n", "def handle_mechanical_toggle(_):\n", " if mechanical_button.value:\n", " natural_button.value = False\n", - " ventilation_box.children[1].layout.display = 'block'\n", + " ventilation_box.children[1].layout.display = 'contents'\n", " else:\n", " ventilation_box.children[1].layout.display = 'none'\n", "\n", @@ -138,7 +138,7 @@ }, { "cell_type": "code", - "execution_count": 29, + "execution_count": 46, "metadata": { "pycharm": { "name": "#%%\n" @@ -179,10 +179,10 @@ "\n", "single_button = w.ToggleButton(value=False, description='Single event', layout={'width': 'auto'})\n", "recurrent_button = w.ToggleButton(value=False, description='Recurrent usage', layout={'width': 'auto'})\n", - "single_recurrent_selection_bar = w.HBox(children=(single_button, recurrent_button))\n", - "month_dropdown = w.Dropdown(options=months, value=None, description=\"Month:\", layout=w.Layout(padding=\"0px 20px 0px 0px\"))\n", - "day_dropdown = w.Dropdown(options=[i for i in range(1, 32)], value=None, description=\"Day:\")\n", - "date_selector = w.HBox(children=(month_dropdown, day_dropdown), layout=w.Layout(display='none'))\n", + "single_recurrent_selection_bar = w.HBox(children=(single_button, recurrent_button), layout=w.Layout(width='auto'), style={'description_width': 'auto'})\n", + "month_dropdown = w.Dropdown(options=months, value=None, description=\"Month:\", layout=w.Layout(width='auto'), style={'description_width': 'auto'})\n", + "day_dropdown = w.Dropdown(options=[i for i in range(1, 32)], value=None, description=\"Day:\", layout=w.Layout(width='auto'))\n", + "date_selector = w.HBox(children=(month_dropdown, day_dropdown), layout=w.Layout(display='none', width='auto'))\n", "\n", "months_bar = w.HBox(children=[w.ToggleButton(value=False, description=month[0].upper()) for month in months],\n", " layout = w.Layout(display='none'))\n", @@ -253,7 +253,7 @@ }, { "cell_type": "code", - "execution_count": 30, + "execution_count": 40, "metadata": { "pycharm": { "name": "#%%\n" @@ -312,7 +312,7 @@ }, { "cell_type": "code", - "execution_count": 31, + "execution_count": 45, "metadata": { "pycharm": { "name": "#%%\n" @@ -325,7 +325,7 @@ "application/vnd.jupyter.widget-view+json": { "version_major": 2, "version_minor": 0, - "model_id": "3bc5f376c4884148be482783a874120a" + "model_id": "8e8d3a2fc68e40039aaaddc4b1814ce3" } }, "metadata": {}, @@ -335,6 +335,25 @@ "source": [ "w.HBox(children=(left_column, middle_column, right_column))" ] + }, + { + "cell_type": "code", + "execution_count": 41, + "outputs": [], + "source": [], + "metadata": { + "collapsed": false, + "pycharm": { + "name": "#%%\n" + } + } + }, + { + "cell_type": "code", + "execution_count": null, + "metadata": {}, + "outputs": [], + "source": [] } ], "metadata": { From cd50c4110fa0a470803452776b3605dff1011fb9 Mon Sep 17 00:00:00 2001 From: markus Date: Tue, 27 Oct 2020 16:06:39 +0100 Subject: [PATCH 17/18] revert to master-state --- app/cara.ipynb | 58 +++++++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 34 deletions(-) diff --git a/app/cara.ipynb b/app/cara.ipynb index 34610701..906bf165 100644 --- a/app/cara.ipynb +++ b/app/cara.ipynb @@ -15,7 +15,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 1, "metadata": {}, "outputs": [], "source": [ @@ -28,21 +28,9 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 5, "metadata": {}, - "outputs": [ - { - "ename": "ModuleNotFoundError", - "evalue": "No module named 'cara'", - "output_type": "error", - "traceback": [ - "\u001B[0;31m---------------------------------------------------------------------------\u001B[0m", - "\u001B[0;31mModuleNotFoundError\u001B[0m Traceback (most recent call last)", - "\u001B[0;32m\u001B[0m in \u001B[0;36m\u001B[0;34m\u001B[0m\n\u001B[0;32m----> 1\u001B[0;31m \u001B[0;32mimport\u001B[0m \u001B[0mcara\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mmodels\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 2\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 3\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 4\u001B[0m \u001B[0;32mdef\u001B[0m \u001B[0mprepare_model\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mvolume\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mn_infected\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;36m1\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mn_exposed\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;36m10\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0mmask\u001B[0m\u001B[0;34m=\u001B[0m\u001B[0;34m'Type I'\u001B[0m\u001B[0;34m)\u001B[0m \u001B[0;34m->\u001B[0m \u001B[0mcara\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mmodels\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mModel\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 5\u001B[0m \"\"\"\n", - "\u001B[0;31mModuleNotFoundError\u001B[0m: No module named 'cara'" - ] - } - ], + "outputs": [], "source": [ "import cara.models\n", "\n", @@ -71,7 +59,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 6, "metadata": {}, "outputs": [], "source": [ @@ -82,7 +70,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 7, "metadata": {}, "outputs": [], "source": [ @@ -105,13 +93,13 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 8, "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "f18dd83234d345e39f3e841dec017ff8", + "model_id": "eb109c0f63e149d69e763aec5d404db2", "version_major": 2, "version_minor": 0 }, @@ -137,13 +125,13 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 9, "metadata": {}, "outputs": [ { "data": { "application/vnd.jupyter.widget-view+json": { - "model_id": "45619847b1a9413f8c864775e597d515", + "model_id": "49ad604786f546f58dba54f1f6e7eded", "version_major": 2, "version_minor": 0 }, @@ -187,20 +175,22 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 10, "metadata": {}, "outputs": [ { - "ename": "NameError", - "evalue": "name 'prepare_model' is not defined", - "output_type": "error", - "traceback": [ - "\u001B[0;31m---------------------------------------------------------------------------\u001B[0m", - "\u001B[0;31mNameError\u001B[0m Traceback (most recent call last)", - "\u001B[0;32m\u001B[0m in \u001B[0;36m\u001B[0;34m\u001B[0m\n\u001B[1;32m 48\u001B[0m \u001B[0mobservable\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mobserve\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mplot_concentrations\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 49\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m---> 50\u001B[0;31m \u001B[0mplot_concentrations\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;36m1\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 51\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 52\u001B[0m \u001B[0mfig\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mcanvas\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mtoolbar_visible\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0;32mTrue\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;32m\u001B[0m in \u001B[0;36mplot_concentrations\u001B[0;34m(_)\u001B[0m\n\u001B[1;32m 8\u001B[0m \u001B[0;32mdef\u001B[0m \u001B[0mplot_concentrations\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0m_\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m:\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 9\u001B[0m \u001B[0;32mglobal\u001B[0m \u001B[0mline\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0;32m---> 10\u001B[0;31m \u001B[0mmodel\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mprepare_model\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0mroom_volume\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0mvalue\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n\u001B[0m\u001B[1;32m 11\u001B[0m \u001B[0;34m\u001B[0m\u001B[0m\n\u001B[1;32m 12\u001B[0m \u001B[0mts\u001B[0m \u001B[0;34m=\u001B[0m \u001B[0mnp\u001B[0m\u001B[0;34m.\u001B[0m\u001B[0marange\u001B[0m\u001B[0;34m(\u001B[0m\u001B[0;36m0\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;36m10.\u001B[0m\u001B[0;34m,\u001B[0m \u001B[0;36m0.01\u001B[0m\u001B[0;34m)\u001B[0m\u001B[0;34m\u001B[0m\u001B[0;34m\u001B[0m\u001B[0m\n", - "\u001B[0;31mNameError\u001B[0m: name 'prepare_model' is not defined" - ] + "data": { + "application/vnd.jupyter.widget-view+json": { + "model_id": "8e76a49d0212462d81200a3959dcd3ff", + "version_major": 2, + "version_minor": 0 + }, + "text/plain": [ + "Accordion(children=(VBox(children=(HBox(children=(Canvas(footer_visible=False, header_visible=False, toolbar=T…" + ] + }, + "metadata": {}, + "output_type": "display_data" } ], "source": [ @@ -293,9 +283,9 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.5" + "version": "3.6.12" } }, "nbformat": 4, "nbformat_minor": 4 -} \ No newline at end of file +} From b7bd89dcc88fb8ea8a2e3c49d3ec43fa41dc9ae9 Mon Sep 17 00:00:00 2001 From: markus Date: Tue, 27 Oct 2020 16:07:17 +0100 Subject: [PATCH 18/18] remove empty cells --- app/covid-calculator.ipynb | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/app/covid-calculator.ipynb b/app/covid-calculator.ipynb index 63367cf1..f663be53 100644 --- a/app/covid-calculator.ipynb +++ b/app/covid-calculator.ipynb @@ -2,7 +2,7 @@ "cells": [ { "cell_type": "code", - "execution_count": 35, + "execution_count": 182, "metadata": {}, "outputs": [], "source": [ @@ -11,7 +11,7 @@ }, { "cell_type": "code", - "execution_count": 36, + "execution_count": 183, "metadata": { "pycharm": { "name": "#%%\n" @@ -31,7 +31,7 @@ }, { "cell_type": "code", - "execution_count": 37, + "execution_count": 184, "metadata": { "pycharm": { "name": "#%%\n" @@ -62,7 +62,7 @@ }, { "cell_type": "code", - "execution_count": 38, + "execution_count": 185, "metadata": { "pycharm": { "name": "#%%\n" @@ -138,7 +138,7 @@ }, { "cell_type": "code", - "execution_count": 46, + "execution_count": 186, "metadata": { "pycharm": { "name": "#%%\n" @@ -253,7 +253,7 @@ }, { "cell_type": "code", - "execution_count": 40, + "execution_count": 187, "metadata": { "pycharm": { "name": "#%%\n" @@ -312,7 +312,7 @@ }, { "cell_type": "code", - "execution_count": 45, + "execution_count": 188, "metadata": { "pycharm": { "name": "#%%\n" @@ -321,12 +321,14 @@ "outputs": [ { "data": { - "text/plain": "HBox(children=(VBox(children=(VBox(children=(HTML(value='CARA Covid Calculator')…", "application/vnd.jupyter.widget-view+json": { + "model_id": "ed8a32168798491b94b149a42af469a2", "version_major": 2, - "version_minor": 0, - "model_id": "8e8d3a2fc68e40039aaaddc4b1814ce3" - } + "version_minor": 0 + }, + "text/plain": [ + "HBox(children=(VBox(children=(VBox(children=(HTML(value='CARA Covid Calculator')…" + ] }, "metadata": {}, "output_type": "display_data" @@ -336,18 +338,6 @@ "w.HBox(children=(left_column, middle_column, right_column))" ] }, - { - "cell_type": "code", - "execution_count": 41, - "outputs": [], - "source": [], - "metadata": { - "collapsed": false, - "pycharm": { - "name": "#%%\n" - } - } - }, { "cell_type": "code", "execution_count": null,