diff --git a/data/1133/cityseer/1133.parquet b/data/1133/cityseer/1133.parquet index f5a63be..2cd7d24 100644 Binary files a/data/1133/cityseer/1133.parquet and b/data/1133/cityseer/1133.parquet differ diff --git a/data/1133/osmnx/1133.parquet b/data/1133/osmnx/1133.parquet index a88ef20..7c24d1f 100644 Binary files a/data/1133/osmnx/1133.parquet and b/data/1133/osmnx/1133.parquet differ diff --git a/data/1656/cityseer/1656.parquet b/data/1656/cityseer/1656.parquet index 36581cf..04fd477 100644 Binary files a/data/1656/cityseer/1656.parquet and b/data/1656/cityseer/1656.parquet differ diff --git a/data/1656/osmnx/1656.parquet b/data/1656/osmnx/1656.parquet index 559a36a..b524099 100644 Binary files a/data/1656/osmnx/1656.parquet and b/data/1656/osmnx/1656.parquet differ diff --git a/data/4617/cityseer/4617.parquet b/data/4617/cityseer/4617.parquet index 2e63730..87ea73c 100644 Binary files a/data/4617/cityseer/4617.parquet and b/data/4617/cityseer/4617.parquet differ diff --git a/data/4617/osmnx/4617.parquet b/data/4617/osmnx/4617.parquet index ed756fb..07d3be7 100644 Binary files a/data/4617/osmnx/4617.parquet and b/data/4617/osmnx/4617.parquet differ diff --git a/data/4881/cityseer/4881.parquet b/data/4881/cityseer/4881.parquet index 3942a86..967b964 100644 Binary files a/data/4881/cityseer/4881.parquet and b/data/4881/cityseer/4881.parquet differ diff --git a/data/4881/osmnx/4881.parquet b/data/4881/osmnx/4881.parquet index ac15f30..7e986f1 100644 Binary files a/data/4881/osmnx/4881.parquet and b/data/4881/osmnx/4881.parquet differ diff --git a/data/809/cityseer/809.parquet b/data/809/cityseer/809.parquet index 94ac1b9..c847066 100644 Binary files a/data/809/cityseer/809.parquet and b/data/809/cityseer/809.parquet differ diff --git a/data/809/osmnx/809.parquet b/data/809/osmnx/809.parquet index 0efcce3..54a338c 100644 Binary files a/data/809/osmnx/809.parquet and b/data/809/osmnx/809.parquet differ diff --git a/data/869/cityseer/869.parquet b/data/869/cityseer/869.parquet index 539c5a0..075bfdb 100644 Binary files a/data/869/cityseer/869.parquet and b/data/869/cityseer/869.parquet differ diff --git a/data/869/osmnx/869.parquet b/data/869/osmnx/869.parquet index a4f00af..f9e63f8 100644 Binary files a/data/869/osmnx/869.parquet and b/data/869/osmnx/869.parquet differ diff --git a/data/8989/cityseer/8989.parquet b/data/8989/cityseer/8989.parquet index 3068de2..5636e27 100644 Binary files a/data/8989/cityseer/8989.parquet and b/data/8989/cityseer/8989.parquet differ diff --git a/data/8989/osmnx/8989.parquet b/data/8989/osmnx/8989.parquet index 325299c..fb4c519 100644 Binary files a/data/8989/osmnx/8989.parquet and b/data/8989/osmnx/8989.parquet differ diff --git a/notebooks/methods/momepy.ipynb b/notebooks/archive/momepy.ipynb similarity index 100% rename from notebooks/methods/momepy.ipynb rename to notebooks/archive/momepy.ipynb diff --git a/notebooks/methods/cityseer.ipynb b/notebooks/methods/cityseer.ipynb index 9da96f5..29c80a0 100644 --- a/notebooks/methods/cityseer.ipynb +++ b/notebooks/methods/cityseer.ipynb @@ -28,13 +28,13 @@ "name": "stdout", "output_type": "stream", "text": [ - "Last updated: 2024-12-04T13:20:25.358364+01:00\n", + "Last updated: 2024-12-05T11:45:54.033468+01:00\n", "\n", "Python implementation: CPython\n", - "Python version : 3.11.9\n", - "IPython version : 8.26.0\n", + "Python version : 3.12.7\n", + "IPython version : 8.30.0\n", "\n", - "Compiler : Clang 16.0.6 \n", + "Compiler : Clang 17.0.6 \n", "OS : Darwin\n", "Release : 24.1.0\n", "Machine : arm64\n", @@ -68,11 +68,11 @@ "name": "stdout", "output_type": "stream", "text": [ - "Watermark: 2.4.3\n", + "Watermark: 2.5.0\n", "\n", + "cityseer : 4.17.2\n", + "core : 0.1.dev170+gc3e76d8.d20241205\n", "geopandas: 1.0.1\n", - "core : 0.1.dev155+ge86f29a.d20240823\n", - "cityseer : 4.15.1\n", "\n" ] } @@ -92,7 +92,7 @@ }, { "cell_type": "code", - "execution_count": 6, + "execution_count": 3, "id": "60f4743b-c752-42e5-9474-1b06310681cd", "metadata": { "execution": { @@ -137,34 +137,7 @@ }, { "cell_type": "code", - "execution_count": 10, - "id": "d9ebf441", - "metadata": {}, - "outputs": [ - { - "data": { - "text/plain": [ - "{'Aleppo': 1133,\n", - " 'Auckland': 869,\n", - " 'Bucaramanga': 4617,\n", - " 'Douala': 809,\n", - " 'Liège': 1656,\n", - " 'Salt Lake City': 4881,\n", - " 'Wuhan': 8989}" - ] - }, - "execution_count": 10, - "metadata": {}, - "output_type": "execute_result" - } - ], - "source": [ - "utils.city_fua" - ] - }, - { - "cell_type": "code", - "execution_count": 4, + "execution_count": 5, "id": "203634c6-8dd0-4e63-baaa-f0a0ac02e81c", "metadata": { "execution": { @@ -182,7 +155,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 6, "id": "9111a595-fb15-4ffd-8a79-88375b2f9c3e", "metadata": { "execution": { @@ -198,6 +171,281 @@ "name": "stdout", "output_type": "stream", "text": [ + "===================================================================\n", + "Starting Aleppo\n", + "-------------------------\n", + "\n", + "\n", + "\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "100%|██████████| 78908/78908 [00:05<00:00, 15605.52it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 1.\n", + "100%|██████████| 78908/78908 [00:00<00:00, 243062.34it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 64445/64445 [00:02<00:00, 26347.83it/s]\n", + "INFO:cityseer.tools.graphs:Removing dangling nodes.\n", + "100%|██████████| 28776/28776 [00:00<00:00, 719327.80it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 28710/28710 [00:00<00:00, 1014203.99it/s]\n", + "INFO:cityseer.tools.util:Creating edges STR tree.\n", + "100%|██████████| 43034/43034 [00:00<00:00, 1415257.36it/s]\n", + "INFO:cityseer.tools.graphs:Splitting opposing edges.\n", + "100%|██████████| 28571/28571 [00:01<00:00, 19287.70it/s]\n", + "INFO:cityseer.tools.graphs:Squashing opposing nodes\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 25.\n", + "100%|██████████| 43576/43576 [00:00<00:00, 109593.99it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 28571/28571 [00:00<00:00, 1138968.76it/s]\n", + "INFO:cityseer.tools.util:Creating nodes STR tree\n", + "100%|██████████| 28551/28551 [00:00<00:00, 229604.00it/s]\n", + "INFO:cityseer.tools.graphs:Consolidating nodes.\n", + "100%|██████████| 28551/28551 [00:02<00:00, 13080.39it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 25.\n", + "100%|██████████| 40936/40936 [00:00<00:00, 209038.34it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 26479/26479 [00:00<00:00, 762033.00it/s]\n", + "INFO:cityseer.tools.graphs:Ironing edges.\n", + "100%|██████████| 40596/40596 [00:00<00:00, 65964.93it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 1.\n", + "100%|██████████| 40593/40593 [00:00<00:00, 127081.53it/s]\n", + "INFO:cityseer.tools.io:Preparing node and edge arrays from networkX graph.\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\tAleppo completed in: 0.344 minutes\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "===================================================================\n", + "Starting Auckland\n", + "-------------------------\n", + "\n", + "\n", + "\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "100%|██████████| 60364/60364 [00:04<00:00, 14590.03it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 1.\n", + "100%|██████████| 60364/60364 [00:00<00:00, 190614.01it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 57031/57031 [00:02<00:00, 19073.53it/s]\n", + "INFO:cityseer.tools.graphs:Removing dangling nodes.\n", + "100%|██████████| 9123/9123 [00:00<00:00, 486042.09it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 8980/8980 [00:00<00:00, 475104.38it/s]\n", + "INFO:cityseer.tools.util:Creating edges STR tree.\n", + "100%|██████████| 12214/12214 [00:00<00:00, 1203015.90it/s]\n", + "INFO:cityseer.tools.graphs:Splitting opposing edges.\n", + "100%|██████████| 8898/8898 [00:00<00:00, 17139.89it/s]\n", + "INFO:cityseer.tools.graphs:Squashing opposing nodes\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 25.\n", + "100%|██████████| 12573/12573 [00:00<00:00, 99041.20it/s] \n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 8898/8898 [00:00<00:00, 468367.37it/s]\n", + "INFO:cityseer.tools.util:Creating nodes STR tree\n", + "100%|██████████| 8792/8792 [00:00<00:00, 51294.62it/s]\n", + "INFO:cityseer.tools.graphs:Consolidating nodes.\n", + "100%|██████████| 8792/8792 [00:00<00:00, 10614.26it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 25.\n", + "100%|██████████| 11037/11037 [00:00<00:00, 49170.69it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 7789/7789 [00:00<00:00, 138540.17it/s]\n", + "INFO:cityseer.tools.graphs:Ironing edges.\n", + "100%|██████████| 10123/10123 [00:00<00:00, 21746.56it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 1.\n", + "100%|██████████| 10083/10083 [00:00<00:00, 300474.37it/s]\n", + "INFO:cityseer.tools.io:Preparing node and edge arrays from networkX graph.\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\tAuckland completed in: 0.2 minutes\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "===================================================================\n", + "Starting Bucaramanga\n", + "-------------------------\n", + "\n", + "\n", + "\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "100%|██████████| 79317/79317 [00:05<00:00, 15568.05it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 1.\n", + "100%|██████████| 79317/79317 [00:00<00:00, 248179.84it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 74716/74716 [00:03<00:00, 20776.55it/s]\n", + "INFO:cityseer.tools.graphs:Removing dangling nodes.\n", + "100%|██████████| 11699/11699 [00:00<00:00, 539002.41it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 11598/11598 [00:00<00:00, 579003.26it/s]\n", + "INFO:cityseer.tools.util:Creating edges STR tree.\n", + "100%|██████████| 16004/16004 [00:00<00:00, 1189706.87it/s]\n", + "INFO:cityseer.tools.graphs:Splitting opposing edges.\n", + "100%|██████████| 11348/11348 [00:00<00:00, 18337.01it/s]\n", + "INFO:cityseer.tools.graphs:Squashing opposing nodes\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 25.\n", + "100%|██████████| 16455/16455 [00:00<00:00, 117387.09it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 11348/11348 [00:00<00:00, 824946.91it/s]\n", + "INFO:cityseer.tools.util:Creating nodes STR tree\n", + "100%|██████████| 11295/11295 [00:00<00:00, 222543.73it/s]\n", + "INFO:cityseer.tools.graphs:Consolidating nodes.\n", + "100%|██████████| 11295/11295 [00:00<00:00, 12518.41it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 25.\n", + "100%|██████████| 14977/14977 [00:00<00:00, 111187.78it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 10304/10304 [00:00<00:00, 528383.95it/s]\n", + "INFO:cityseer.tools.graphs:Ironing edges.\n", + "100%|██████████| 14669/14669 [00:00<00:00, 33762.33it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 1.\n", + "100%|██████████| 14660/14660 [00:00<00:00, 89109.37it/s]\n", + "INFO:cityseer.tools.io:Preparing node and edge arrays from networkX graph.\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\tBucaramanga completed in: 0.236 minutes\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "===================================================================\n", + "Starting Douala\n", + "-------------------------\n", + "\n", + "\n", + "\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "100%|██████████| 84819/84819 [00:05<00:00, 15652.51it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 1.\n", + "100%|██████████| 84819/84819 [00:00<00:00, 237259.22it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 76391/76391 [00:03<00:00, 21004.46it/s]\n", + "INFO:cityseer.tools.graphs:Removing dangling nodes.\n", + "100%|██████████| 22124/22124 [00:00<00:00, 513290.90it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 22089/22089 [00:00<00:00, 993032.87it/s]\n", + "INFO:cityseer.tools.util:Creating edges STR tree.\n", + "100%|██████████| 30379/30379 [00:00<00:00, 1182705.35it/s]\n", + "INFO:cityseer.tools.graphs:Splitting opposing edges.\n", + "100%|██████████| 21947/21947 [00:00<00:00, 23346.76it/s]\n", + "INFO:cityseer.tools.graphs:Squashing opposing nodes\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 25.\n", + "100%|██████████| 30722/30722 [00:00<00:00, 205697.92it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 21947/21947 [00:00<00:00, 1150741.18it/s]\n", + "INFO:cityseer.tools.util:Creating nodes STR tree\n", + "100%|██████████| 21940/21940 [00:00<00:00, 224399.34it/s]\n", + "INFO:cityseer.tools.graphs:Consolidating nodes.\n", + "100%|██████████| 21940/21940 [00:01<00:00, 15503.53it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 25.\n", + "100%|██████████| 29235/29235 [00:00<00:00, 174487.12it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 20753/20753 [00:00<00:00, 795528.95it/s]\n", + "INFO:cityseer.tools.graphs:Ironing edges.\n", + "100%|██████████| 28941/28941 [00:00<00:00, 50488.55it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 1.\n", + "100%|██████████| 28941/28941 [00:00<00:00, 337788.54it/s]\n", + "INFO:cityseer.tools.io:Preparing node and edge arrays from networkX graph.\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\tDouala completed in: 0.288 minutes\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "===================================================================\n", + "Starting Liège\n", + "-------------------------\n", + "\n", + "\n", + "\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "100%|██████████| 79907/79907 [00:05<00:00, 15701.31it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 1.\n", + "100%|██████████| 79907/79907 [00:00<00:00, 207142.86it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 75549/75549 [00:03<00:00, 19323.60it/s]\n", + "INFO:cityseer.tools.graphs:Removing dangling nodes.\n", + "100%|██████████| 12210/12210 [00:00<00:00, 514021.26it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 12061/12061 [00:00<00:00, 595686.69it/s]\n", + "INFO:cityseer.tools.util:Creating edges STR tree.\n", + "100%|██████████| 16321/16321 [00:00<00:00, 1110258.94it/s]\n", + "INFO:cityseer.tools.graphs:Splitting opposing edges.\n", + "100%|██████████| 11977/11977 [00:00<00:00, 19339.29it/s]\n", + "INFO:cityseer.tools.graphs:Squashing opposing nodes\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 25.\n", + "100%|██████████| 16657/16657 [00:00<00:00, 109014.78it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 11977/11977 [00:00<00:00, 595076.63it/s]\n", + "INFO:cityseer.tools.util:Creating nodes STR tree\n", + "100%|██████████| 11881/11881 [00:00<00:00, 215577.77it/s]\n", + "INFO:cityseer.tools.graphs:Consolidating nodes.\n", + "100%|██████████| 11881/11881 [00:00<00:00, 13853.63it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 25.\n", + "100%|██████████| 15344/15344 [00:00<00:00, 101095.03it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 10962/10962 [00:00<00:00, 408025.63it/s]\n", + "INFO:cityseer.tools.graphs:Ironing edges.\n", + "100%|██████████| 14951/14951 [00:00<00:00, 33182.91it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 1.\n", + "100%|██████████| 14894/14894 [00:00<00:00, 294662.69it/s]\n", + "INFO:cityseer.tools.io:Preparing node and edge arrays from networkX graph.\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\tLiège completed in: 0.25 minutes\n", + "\n", + "\n", + "\n", + "\n", + "\n", "===================================================================\n", "Starting Salt Lake City\n", "-------------------------\n", @@ -210,34 +458,91 @@ "name": "stderr", "output_type": "stream", "text": [ - "100%|██████████| 50917/50917 [00:03<00:00, 16610.66it/s]\n", + "100%|██████████| 50917/50917 [00:03<00:00, 14873.26it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 1.\n", + "100%|██████████| 50917/50917 [00:00<00:00, 197498.98it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 46988/46988 [00:02<00:00, 19518.39it/s]\n", + "INFO:cityseer.tools.graphs:Removing dangling nodes.\n", + "100%|██████████| 9539/9539 [00:00<00:00, 498877.37it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 9473/9473 [00:00<00:00, 715490.92it/s]\n", + "INFO:cityseer.tools.util:Creating edges STR tree.\n", + "100%|██████████| 13358/13358 [00:00<00:00, 1214030.61it/s]\n", + "INFO:cityseer.tools.graphs:Splitting opposing edges.\n", + "100%|██████████| 9431/9431 [00:00<00:00, 23919.74it/s]\n", + "INFO:cityseer.tools.graphs:Squashing opposing nodes\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 25.\n", + "100%|██████████| 13453/13453 [00:00<00:00, 208025.08it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 9431/9431 [00:00<00:00, 754074.40it/s]\n", + "INFO:cityseer.tools.util:Creating nodes STR tree\n", + "100%|██████████| 9387/9387 [00:00<00:00, 117552.02it/s]\n", + "INFO:cityseer.tools.graphs:Consolidating nodes.\n", + "100%|██████████| 9387/9387 [00:00<00:00, 17272.91it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 25.\n", + "100%|██████████| 12985/12985 [00:00<00:00, 141192.15it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 9069/9069 [00:00<00:00, 552791.60it/s]\n", + "INFO:cityseer.tools.graphs:Ironing edges.\n", + "100%|██████████| 12801/12801 [00:00<00:00, 40015.51it/s]\n", + "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 1.\n", + "100%|██████████| 12797/12797 [00:00<00:00, 303702.22it/s]\n", + "INFO:cityseer.tools.io:Preparing node and edge arrays from networkX graph.\n" + ] + }, + { + "name": "stdout", + "output_type": "stream", + "text": [ + "\tSalt Lake City completed in: 0.158 minutes\n", + "\n", + "\n", + "\n", + "\n", + "\n", + "===================================================================\n", + "Starting Wuhan\n", + "-------------------------\n", + "\n", + "\n", + "\n" + ] + }, + { + "name": "stderr", + "output_type": "stream", + "text": [ + "100%|██████████| 92667/92667 [00:05<00:00, 15955.65it/s]\n", "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 1.\n", - "100%|██████████| 50917/50917 [00:00<00:00, 176495.40it/s]\n", + "100%|██████████| 92667/92667 [00:00<00:00, 255404.18it/s]\n", "INFO:cityseer.tools.graphs:Removing filler nodes.\n", - "100%|██████████| 46988/46988 [00:02<00:00, 17447.32it/s]\n", + "100%|██████████| 82891/82891 [00:04<00:00, 20387.45it/s]\n", "INFO:cityseer.tools.graphs:Removing dangling nodes.\n", - "100%|██████████| 9539/9539 [00:00<00:00, 528184.74it/s]\n", + "100%|██████████| 19549/19549 [00:00<00:00, 648459.40it/s]\n", + "INFO:cityseer.tools.graphs:Removing filler nodes.\n", + "100%|██████████| 19433/19433 [00:00<00:00, 806953.08it/s]\n", "INFO:cityseer.tools.util:Creating edges STR tree.\n", - "100%|██████████| 13400/13400 [00:00<00:00, 1228576.16it/s]\n", + "100%|██████████| 29120/29120 [00:00<00:00, 1223976.15it/s]\n", "INFO:cityseer.tools.graphs:Splitting opposing edges.\n", - "100%|██████████| 9473/9473 [00:00<00:00, 17056.95it/s]\n", + "100%|██████████| 19369/19369 [00:01<00:00, 10544.77it/s]\n", "INFO:cityseer.tools.graphs:Squashing opposing nodes\n", "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 25.\n", - "100%|██████████| 13571/13571 [00:00<00:00, 94405.58it/s] \n", + "100%|██████████| 31499/31499 [00:00<00:00, 72791.23it/s] \n", "INFO:cityseer.tools.graphs:Removing filler nodes.\n", - "100%|██████████| 9473/9473 [00:00<00:00, 255589.35it/s]\n", + "100%|██████████| 19369/19369 [00:00<00:00, 845988.96it/s]\n", "INFO:cityseer.tools.util:Creating nodes STR tree\n", - "100%|██████████| 9246/9246 [00:00<00:00, 211729.22it/s]\n", + "100%|██████████| 19302/19302 [00:00<00:00, 220126.80it/s]\n", "INFO:cityseer.tools.graphs:Consolidating nodes.\n", - "100%|██████████| 9246/9246 [00:00<00:00, 20275.20it/s]\n", + "100%|██████████| 19302/19302 [00:02<00:00, 9159.77it/s] \n", "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 25.\n", - "100%|██████████| 12793/12793 [00:00<00:00, 46582.70it/s]\n", + "100%|██████████| 27281/27281 [00:00<00:00, 43434.17it/s]\n", "INFO:cityseer.tools.graphs:Removing filler nodes.\n", - "100%|██████████| 8988/8988 [00:00<00:00, 514218.74it/s]\n", + "100%|██████████| 16965/16965 [00:00<00:00, 571601.36it/s]\n", "INFO:cityseer.tools.graphs:Ironing edges.\n", - "100%|██████████| 12696/12696 [00:01<00:00, 12350.66it/s]\n", + "100%|██████████| 26076/26076 [00:00<00:00, 29965.49it/s]\n", "INFO:cityseer.tools.graphs:Merging parallel edges within buffer of 1.\n", - "100%|██████████| 12696/12696 [00:00<00:00, 321979.39it/s]\n", + "100%|██████████| 26073/26073 [00:00<00:00, 323718.95it/s]\n", "INFO:cityseer.tools.io:Preparing node and edge arrays from networkX graph.\n" ] }, @@ -245,7 +550,7 @@ "name": "stdout", "output_type": "stream", "text": [ - "\tSalt Lake City completed in: 0.172 minutes\n", + "\tWuhan completed in: 0.347 minutes\n", "\n", "\n", "\n", @@ -255,7 +560,7 @@ " ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~\n", "~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ \n", " ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~\n", - "Total runtime: 0.172 minutes\n" + "Total runtime: 1.823 minutes\n" ] } ], @@ -319,7 +624,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.9" + "version": "3.12.7" } }, "nbformat": 4, diff --git a/notebooks/methods/osmnx.ipynb b/notebooks/methods/osmnx.ipynb index a678c99..e8b90e1 100644 --- a/notebooks/methods/osmnx.ipynb +++ b/notebooks/methods/osmnx.ipynb @@ -32,18 +32,18 @@ "name": "stdout", "output_type": "stream", "text": [ - "Last updated: 2024-12-01T12:46:37.707044+01:00\n", + "Last updated: 2024-12-05T11:50:41.774192+01:00\n", "\n", "Python implementation: CPython\n", - "Python version : 3.11.9\n", - "IPython version : 8.26.0\n", + "Python version : 3.12.7\n", + "IPython version : 8.30.0\n", "\n", - "Compiler : Clang 16.0.6 \n", + "Compiler : Clang 17.0.6 \n", "OS : Darwin\n", - "Release : 23.6.0\n", - "Machine : x86_64\n", - "Processor : i386\n", - "CPU cores : 12\n", + "Release : 24.1.0\n", + "Machine : arm64\n", + "Processor : arm\n", + "CPU cores : 8\n", "Architecture: 64bit\n", "\n" ] @@ -71,13 +71,13 @@ "name": "stdout", "output_type": "stream", "text": [ - "Watermark: 2.4.3\n", + "Watermark: 2.5.0\n", "\n", - "momepy : 0.8.1\n", + "core : 0.1.dev170+gc3e76d8.d20241205\n", + "momepy : 0.9.1\n", "geopandas: 1.0.1\n", - "networkx : 3.3\n", - "osmnx : 1.9.3\n", - "core : 0.1.dev112+g68a4526\n", + "osmnx : 2.0.0\n", + "networkx : 3.4.2\n", "\n" ] } @@ -360,7 +360,7 @@ ], "metadata": { "kernelspec": { - "display_name": "simplification", + "display_name": "default", "language": "python", "name": "python3" }, @@ -374,7 +374,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.9" + "version": "3.12.7" } }, "nbformat": 4,