diff --git a/notebooks/basics.ipynb b/notebooks/basics.ipynb index 9f62f4f..ca10092 100644 --- a/notebooks/basics.ipynb +++ b/notebooks/basics.ipynb @@ -25,7 +25,7 @@ }, { "cell_type": "code", - "execution_count": 1, + "execution_count": 15, "id": "63fb7d1a-cd49-4aac-8d4f-31bb54496a51", "metadata": { "tags": [] @@ -35,9 +35,9 @@ "name": "stdout", "output_type": "stream", "text": [ - "-e git+https://github.com/vivarium-collective/bigraph-schema.git@a7010c1e2f137586078abfdc815eb27f25a6f886#egg=bigraph_schema\n", - "-e git+https://github.com/vivarium-collective/bigraph-viz.git@5eba77f4f72f164f54700d1f1b4d3c60d7777b0c#egg=bigraph_viz\n", - "-e git+https://github.com/vivarium-collective/process-bigraph.git@975b59fbed8800956cc163ac39cfeca152fb8515#egg=process_bigraph\n" + "-e git+https://github.com/vivarium-collective/bigraph-schema.git@6075161f7a063d2e2ccbff269d84e199b9418245#egg=bigraph_schema\n", + "-e git+https://github.com/vivarium-collective/bigraph-viz.git@cc41bb038afd6aaacd6f805e22db00196640d441#egg=bigraph_viz\n", + "-e git+https://github.com/vivarium-collective/process-bigraph.git@4bbb8c94185b6fbfe195b3edd92d602ba0d5fa25#egg=process_bigraph\n" ] } ], @@ -57,7 +57,7 @@ }, { "cell_type": "code", - "execution_count": 2, + "execution_count": 16, "id": "2ab3cb32-e007-45c4-807e-b1b442ac1608", "metadata": { "tags": [] @@ -98,7 +98,7 @@ }, { "cell_type": "code", - "execution_count": 3, + "execution_count": 17, "id": "d711b952-089a-4938-817d-d1ccad9de56e", "metadata": { "tags": [] @@ -135,10 +135,10 @@ "\n" ], "text/plain": [ - "" + "" ] }, - "execution_count": 3, + "execution_count": 17, "metadata": {}, "output_type": "execute_result" } @@ -160,7 +160,7 @@ }, { "cell_type": "code", - "execution_count": 4, + "execution_count": 18, "id": "f3e5fa71-7ffc-4a8f-a1a0-dc547c886f84", "metadata": {}, "outputs": [ @@ -190,16 +190,16 @@ "('store1',)\n", "\n", "store1\n", - "[float]\n", + "[any]\n", "\n", "\n", "\n" ], "text/plain": [ - "" + "" ] }, - "execution_count": 4, + "execution_count": 18, "metadata": {}, "output_type": "execute_result" } @@ -225,7 +225,7 @@ }, { "cell_type": "code", - "execution_count": 5, + "execution_count": 19, "id": "0f3f0824-f89d-4c6e-830e-2c5a321f7b33", "metadata": {}, "outputs": [ @@ -326,10 +326,10 @@ "\n" ], "text/plain": [ - "" + "" ] }, - "execution_count": 5, + "execution_count": 19, "metadata": {}, "output_type": "execute_result" } @@ -369,7 +369,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 20, "id": "7c74237b-0d66-4e8f-a8ca-79174fadad8b", "metadata": {}, "outputs": [ @@ -400,18 +400,18 @@ "\n", "process1\n", "\n", - "\n", - "\n", + "\n", + "\n", "\n", - "('process1', 'p', 'o', 'r', 't', '1')->('process1',)\n", + "('process1', 'p', 'o', 'r', 't', '1')_input->('process1',)\n", "\n", "\n", "port1\n", "\n", - "\n", - "\n", + "\n", + "\n", "\n", - "('process1', 'p', 'o', 'r', 't', '2')->('process1',)\n", + "('process1', 'p', 'o', 'r', 't', '2')_input->('process1',)\n", "\n", "\n", "port2\n", @@ -420,10 +420,10 @@ "\n" ], "text/plain": [ - "" + "" ] }, - "execution_count": 6, + "execution_count": 20, "metadata": {}, "output_type": "execute_result" } @@ -451,7 +451,7 @@ }, { "cell_type": "code", - "execution_count": 7, + "execution_count": 21, "id": "8c2457a3-fc47-4850-8b9e-9ee98e81567d", "metadata": {}, "outputs": [ @@ -494,50 +494,50 @@ "\n", "process3\n", "\n", - "\n", - "\n", + "\n", + "\n", "\n", - "('process1', 'p', 'o', 'r', 't', '1')->('process1',)\n", + "('process1', 'p', 'o', 'r', 't', '1')_input->('process1',)\n", "\n", "\n", "port1\n", "\n", - "\n", - "\n", + "\n", + "\n", "\n", - "('process2', 'p', 'o', 'r', 't', '1')->('process2',)\n", + "('process2', 'p', 'o', 'r', 't', '1')_input->('process2',)\n", "\n", "\n", "port1\n", "\n", - "\n", - "\n", + "\n", + "\n", "\n", - "('process3', 'p', 'o', 'r', 't', '1')->('process3',)\n", + "('process3', 'p', 'o', 'r', 't', '1')_input->('process3',)\n", "\n", "\n", "port1\n", "\n", - "\n", - "\n", + "\n", + "\n", "\n", - "('process1', 'p', 'o', 'r', 't', '2')->('process1',)\n", + "('process1', 'p', 'o', 'r', 't', '2')_output->('process1',)\n", "\n", "\n", "port2\n", "\n", - "\n", - "\n", + "\n", + "\n", "\n", - "('process2', 'p', 'o', 'r', 't', '2')->('process2',)\n", + "('process2', 'p', 'o', 'r', 't', '2')_output->('process2',)\n", "\n", "\n", "port2\n", "\n", - "\n", - "\n", + "\n", + "\n", "\n", - "('process3', 'p', 'o', 'r', 't', '2')->('process3',)\n", + "('process3', 'p', 'o', 'r', 't', '2')_output->('process3',)\n", "\n", "\n", "port2\n", @@ -546,10 +546,10 @@ "\n" ], "text/plain": [ - "" + "" ] }, - "execution_count": 7, + "execution_count": 21, "metadata": {}, "output_type": "execute_result" } @@ -584,7 +584,7 @@ }, { "cell_type": "code", - "execution_count": 8, + "execution_count": 22, "id": "a6ecad5d-8948-4636-910c-79284a3e8679", "metadata": {}, "outputs": [ @@ -658,10 +658,10 @@ "\n" ], "text/plain": [ - "" + "" ] }, - "execution_count": 8, + "execution_count": 22, "metadata": {}, "output_type": "execute_result" } @@ -672,8 +672,8 @@ " '_type': 'edge',\n", " '_inputs': {\n", " 'port1': 'float',\n", - " 'port2': 'int',\n", - " 'port3': 'int',\n", + " 'port2': 'integer',\n", + " 'port3': 'integer',\n", " },\n", " 'inputs': {\n", " 'port1': ['node1'],\n", @@ -682,8 +682,8 @@ " }\n", " },\n", " 'node1': 'float', # TODO -- shouldn't these fill?\n", - " 'node2': 'int',\n", - " 'node3': 'int',\n", + " 'node2': 'integer',\n", + " 'node3': 'integer',\n", "}\n", "plot_bigraph(connected_process_spec, **plot_settings, filename='wires')" ] @@ -716,7 +716,7 @@ }, { "cell_type": "code", - "execution_count": 9, + "execution_count": 23, "id": "781a84e6-bbe2-4708-b441-47efc611b46f", "metadata": {}, "outputs": [ @@ -797,10 +797,10 @@ "\n" ], "text/plain": [ - "" + "" ] }, - "execution_count": 9, + "execution_count": 23, "metadata": {}, "output_type": "execute_result" } @@ -808,12 +808,12 @@ "source": [ "flat_composite_spec = {\n", " 'store1.1': 'float',\n", - " 'store1.2': 'int',\n", + " 'store1.2': 'integer',\n", " 'process1': {\n", " '_type': 'process',\n", " '_outputs': {\n", " 'port1': 'float',\n", - " 'port2': 'int',\n", + " 'port2': 'integer',\n", " },\n", " 'outputs': {\n", " 'port1': ['store1.1'],\n", @@ -824,7 +824,7 @@ " '_type': 'process',\n", " '_inputs': {\n", " 'port1': 'float',\n", - " 'port2': 'int',\n", + " 'port2': 'integer',\n", " },\n", " 'inputs': {\n", " 'port1': ['store1.1'],\n", @@ -846,7 +846,7 @@ }, { "cell_type": "code", - "execution_count": 10, + "execution_count": 38, "id": "701e759d-7f9b-41bb-911c-a8208c892462", "metadata": {}, "outputs": [ @@ -966,10 +966,10 @@ "\n" ], "text/plain": [ - "" + "" ] }, - "execution_count": 10, + "execution_count": 38, "metadata": {}, "output_type": "execute_result" } @@ -978,12 +978,12 @@ "nested_composite_spec = {\n", " 'store1': {\n", " 'store1.1': 'float',\n", - " 'store1.2': 'int',\n", + " 'store1.2': 'integer',\n", " 'process1': {\n", " '_type': 'process',\n", " '_inputs': {\n", " 'port1': 'float',\n", - " 'port2': 'int',\n", + " 'port2': 'integer',\n", " },\n", " 'inputs': {\n", " 'port1': ['store1.1'],\n", @@ -994,7 +994,7 @@ " '_type': 'process',\n", " '_outputs': {\n", " 'port1': 'float',\n", - " 'port2': 'int',\n", + " 'port2': 'integer',\n", " },\n", " 'outputs': {\n", " 'port1': ['store1.1'],\n", @@ -1028,7 +1028,7 @@ }, { "cell_type": "code", - "execution_count": 11, + "execution_count": 25, "id": "638c5dc7-4cfd-46e4-b66a-8c42ca98ff1d", "metadata": {}, "outputs": [ @@ -1127,10 +1127,10 @@ "\n" ], "text/plain": [ - "" + "" ] }, - "execution_count": 11, + "execution_count": 25, "metadata": {}, "output_type": "execute_result" } @@ -1144,7 +1144,7 @@ " '_type': 'process',\n", " '_outputs': {\n", " 'port1': 'float',\n", - " 'port2': 'int',\n", + " 'port2': 'integer',\n", " },\n", " 'outputs': {\n", " 'port1': ['store1.1'],\n", @@ -1155,7 +1155,7 @@ " '_type': 'process',\n", " '_outputs': {\n", " 'port1': 'float',\n", - " 'port2': 'int',\n", + " 'port2': 'integer',\n", " },\n", " 'outputs': {\n", " 'port1': ['store1.1'],\n", @@ -1188,7 +1188,7 @@ }, { "cell_type": "code", - "execution_count": 12, + "execution_count": 26, "id": "e76c97a8-3037-464a-929e-ba4414c73c34", "metadata": {}, "outputs": [], @@ -1213,7 +1213,7 @@ }, { "cell_type": "code", - "execution_count": 13, + "execution_count": 27, "id": "f0eff7b0-f0e2-4d56-8b16-ef0fc1ce5aba", "metadata": {}, "outputs": [], @@ -1246,7 +1246,7 @@ }, { "cell_type": "code", - "execution_count": 14, + "execution_count": 28, "id": "db45c99b-b97b-47bc-a73e-c669882f3969", "metadata": {}, "outputs": [], @@ -1299,7 +1299,7 @@ }, { "cell_type": "code", - "execution_count": 15, + "execution_count": 29, "id": "47bdf8e5-0bdd-4cac-b57e-2449c75fa178", "metadata": { "tags": [] @@ -1896,10 +1896,10 @@ "\n" ], "text/plain": [ - "" + "" ] }, - "execution_count": 15, + "execution_count": 29, "metadata": {}, "output_type": "execute_result" } @@ -1957,7 +1957,7 @@ }, { "cell_type": "code", - "execution_count": 16, + "execution_count": 30, "id": "ab431982-d156-4b7a-9918-384a5ea5132a", "metadata": { "tags": [] @@ -1989,7 +1989,7 @@ " 'nuclear transcriptional speckle': {'negative regulation of RNA biosynthesis process': {}}}}}" ] }, - "execution_count": 16, + "execution_count": 30, "metadata": {}, "output_type": "execute_result" } @@ -2000,7 +2000,7 @@ }, { "cell_type": "code", - "execution_count": 17, + "execution_count": 31, "id": "5a76608a-fff0-4005-9f32-c02afef39d9e", "metadata": { "tags": [] @@ -2771,10 +2771,10 @@ "negative\n", "regulation\n", "\n", - "\n", - "\n", + "\n", + "\n", "\n", - "('cell', 'translation', 'm', 'e', 'm', 'b', 'r', 'a', 'n', 'e')->('cell', 'translation')\n", + "('cell', 'translation', 'm', 'e', 'm', 'b', 'r', 'a', 'n', 'e')_output->('cell', 'translation')\n", "\n", "\n", "membrane\n", @@ -2783,10 +2783,10 @@ "\n" ], "text/plain": [ - "" + "" ] }, - "execution_count": 17, + "execution_count": 31, "metadata": {}, "output_type": "execute_result" } @@ -2931,7 +2931,7 @@ }, { "cell_type": "code", - "execution_count": 18, + "execution_count": 32, "id": "fe3008ad-498e-449f-8521-6ea29fd903f1", "metadata": { "tags": [] @@ -2965,17 +2965,17 @@ "hypothesized\n", "mechanism\n", "\n", - "\n", - "\n", + "\n", + "\n", "\n", - "('hypothesized<br/>mechanism', '1')->('hypothesized<br/>mechanism',)\n", + "('hypothesized<br/>mechanism', '1')_input->('hypothesized<br/>mechanism',)\n", "\n", "\n", "\n", - "\n", - "\n", + "\n", + "\n", "\n", - "('hypothesized<br/>mechanism', '2')->('hypothesized<br/>mechanism',)\n", + "('hypothesized<br/>mechanism', '2')_input->('hypothesized<br/>mechanism',)\n", "\n", "\n", "\n", @@ -2983,10 +2983,10 @@ "\n" ], "text/plain": [ - "" + "" ] }, - "execution_count": 18, + "execution_count": 32, "metadata": {}, "output_type": "execute_result" } @@ -3025,7 +3025,7 @@ }, { "cell_type": "code", - "execution_count": 19, + "execution_count": 33, "id": "b39417ce-d9a1-4985-abce-ce22df816897", "metadata": { "tags": [] @@ -3047,60 +3047,49 @@ "\n", "\n", - "\n", - "\n", + "\n", + "\n", "bigraph\n", - "\n", + "\n", "\n", "\n", "('cell',)\n", - "\n", - "cell\n", + "\n", + "cell\n", "\n", "\n", "\n", "('cell', 'membrane')\n", - "\n", - "membrane\n", + "\n", + "membrane\n", "\n", "\n", "\n", "('cell',)->('cell', 'membrane')\n", - "\n", + "\n", "\n", "\n", "\n", "('cell', 'cytoplasm')\n", - "\n", - "cytoplasm\n", + "\n", + "cytoplasm\n", "\n", "\n", "\n", "('cell',)->('cell', 'cytoplasm')\n", - "\n", - "\n", - "\n", - "\n", - "('cell', 'metabolites')\n", - "\n", - "metabolites\n", - "\n", - "\n", - "\n", - "('cell',)->('cell', 'metabolites')\n", - "\n", + "\n", "\n", "\n", - "\n", + "\n", "('cell', 'nucleoid')\n", - "\n", - "nucleoid\n", + "\n", + "nucleoid\n", "\n", "\n", - "\n", + "\n", "('cell',)->('cell', 'nucleoid')\n", - "\n", + "\n", "\n", "\n", "\n", @@ -3111,7 +3100,7 @@ "\n", "\n", "('cell', 'membrane')->('cell', 'membrane', 'transporters')\n", - "\n", + "\n", "\n", "\n", "\n", @@ -3122,17 +3111,17 @@ "\n", "\n", "('cell', 'membrane')->('cell', 'membrane', 'lipids')\n", - "\n", + "\n", "\n", "\n", - "\n", + "\n", "('cell', 'membrane', 'transmembrane transport')\n", "\n", "transmembrane transport\n", "\n", "\n", "\n", - "\n", + "\n", "('cell', 'membrane', 'transporters')->('cell', 'membrane', 'transmembrane transport')\n", "\n", "\n", @@ -3147,7 +3136,7 @@ "\n", "\n", "('cell', 'cytoplasm')->('cell', 'cytoplasm', 'metabolites')\n", - "\n", + "\n", "\n", "\n", "\n", @@ -3158,7 +3147,7 @@ "\n", "\n", "('cell', 'cytoplasm')->('cell', 'cytoplasm', 'ribosomal complexes')\n", - "\n", + "\n", "\n", "\n", "\n", @@ -3169,24 +3158,24 @@ "\n", "\n", "('cell', 'cytoplasm')->('cell', 'cytoplasm', 'transcript regulation complex')\n", - "\n", + "\n", "\n", "\n", - "\n", + "\n", "('cell', 'cytoplasm', 'translation')\n", "\n", "translation\n", "\n", "\n", "\n", - "\n", + "\n", "('cell', 'cytoplasm', 'metabolites')->('cell', 'membrane', 'transmembrane transport')\n", "\n", "\n", "internal\n", "\n", "\n", - "\n", + "\n", "('cell', 'cytoplasm', 'ribosomal complexes')->('cell', 'cytoplasm', 'translation')\n", "\n", "\n", @@ -3204,14 +3193,14 @@ "\n", "\n", "\n", - "\n", + "\n", "('cell', 'cytoplasm', 'transcript regulation complex', 'transcripts')->('cell', 'cytoplasm', 'translation')\n", "\n", "\n", "p2\n", "\n", "\n", - "\n", + "\n", "('cell', 'nucleoid', 'chromosome')\n", "\n", "chromosome\n", @@ -3219,10 +3208,10 @@ "\n", "\n", "('cell', 'nucleoid')->('cell', 'nucleoid', 'chromosome')\n", - "\n", + "\n", "\n", "\n", - "\n", + "\n", "('cell', 'nucleoid', 'chromosome', 'genes')\n", "\n", "genes\n", @@ -3232,10 +3221,10 @@ "('cell', 'nucleoid', 'chromosome')->('cell', 'nucleoid', 'chromosome', 'genes')\n", "\n", "\n", - "\n", - "\n", - "\n", - "('cell', 'membrane', 'transmembrane transport', 'e', 'x', 't', 'e', 'r', 'n', 'a', 'l')->('cell', 'membrane', 'transmembrane transport')\n", + "\n", + "\n", + "\n", + "('cell', 'membrane', 'transmembrane transport', 'e', 'x', 't', 'e', 'r', 'n', 'a', 'l')_output->('cell', 'membrane', 'transmembrane transport')\n", "\n", "\n", "external\n", @@ -3244,10 +3233,10 @@ "\n" ], "text/plain": [ - "" + "" ] }, - "execution_count": 19, + "execution_count": 33, "metadata": {}, "output_type": "execute_result" } @@ -3324,7 +3313,7 @@ }, { "cell_type": "code", - "execution_count": 20, + "execution_count": 34, "id": "16960d1b-6e35-421e-bb7d-3efe5052e4fc", "metadata": { "tags": [] diff --git a/notebooks/bigraph_example.ipynb b/notebooks/bigraph_example.ipynb index 685040c..2d0913c 100644 --- a/notebooks/bigraph_example.ipynb +++ b/notebooks/bigraph_example.ipynb @@ -883,7 +883,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.13" + "version": "3.9.6" } }, "nbformat": 4, diff --git a/notebooks/ecoli.ipynb b/notebooks/ecoli.ipynb index b8fc395..d2e9974 100644 --- a/notebooks/ecoli.ipynb +++ b/notebooks/ecoli.ipynb @@ -2128,7 +2128,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.13" + "version": "3.9.6" } }, "nbformat": 4, diff --git a/setup.py b/setup.py index 1dc5dca..f0a8a31 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages -VERSION = '0.0.33' +VERSION = '0.0.34' with open("README.md", "r") as readme: