From ba257465c4a50fc306ad3444876f1b32d587ff8c Mon Sep 17 00:00:00 2001 From: markus Date: Wed, 21 Oct 2020 16:42:10 +0200 Subject: [PATCH] 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": {