Skip to content

GitLab

Commit 91bccabb authored by Joseph Siddons's avatar Joseph Siddons
Browse files

docs: update octtree example notebook to account for bounding rectangle definition

parent ad6d4952
main v0.11.2 v0.11.1 v0.11.0 v0.10.1 v0.10.0 v0.9.0 v0.8.0 v0.7.1 v0.7.0 v0.6.0
1 merge request!9Define Rectangle and SpaceTimeRectangle by bounding box
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 66 deletions
notebooks/octtree.ipynb
View file @ 91bccabb
......@@ -120,7 +120,7 @@
"metadata": {},
"outputs": [],
"source": [
"otree = OctTree(Rectangle(0, 0, datetime(1900, 1, 16), 360, 180, timedelta(days=32)), capacity = 10, max_depth = 25)"
"otree = OctTree(Rectangle(-180, 180, -90, 90, datetime(1900, 1, 1, 0), datetime(1900, 1, 31, 23)), capacity = 10, max_depth = 25)"
]
},
{
......@@ -133,8 +133,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"CPU times: user 213 ms, sys: 5.74 ms, total: 219 ms\n",
"Wall time: 218 ms\n"
"CPU times: user 106 ms, sys: 3.98 ms, total: 110 ms\n",
"Wall time: 109 ms\n"
]
}
],
......@@ -157,105 +157,105 @@
"output_type": "stream",
"text": [
"OctTree:\n",
"- boundary: SpaceTimeRectangle(lon=0, lat=0, date=datetime.datetime(1900, 1, 16, 0, 0), lon_range=360, lat_range=180, dt=datetime.timedelta(days=32))\n",
"- boundary: SpaceTimeRectangle(west=-180, east=180, south=-90, north=90, start=datetime.datetime(1900, 1, 1, 0, 0), end=datetime.datetime(1900, 1, 31, 23, 0))\n",
"- capacity: 10\n",
"- depth: 0\n",
"- max_depth: 25\n",
"- contents:\n",
"- number of elements: 10\n",
" * SpaceTimeRecord(x = -12, y = 89, datetime = 1900-01-03 18:00:00, uid = 70Fv8aPq)\n",
" * SpaceTimeRecord(x = -157, y = 21, datetime = 1900-01-29 16:00:00, uid = j2xUkgob)\n",
" * SpaceTimeRecord(x = -179, y = -25, datetime = 1900-01-30 19:00:00, uid = Nmw6lJSS)\n",
" * SpaceTimeRecord(x = -23, y = 89, datetime = 1900-01-14 15:00:00, uid = ILOWgH6u)\n",
" * SpaceTimeRecord(x = 145, y = 41, datetime = 1900-01-26 03:00:00, uid = Cii4cemG)\n",
" * SpaceTimeRecord(x = -139, y = -10, datetime = 1900-01-06 21:00:00, uid = 3QFhOlsW)\n",
" * SpaceTimeRecord(x = -146, y = -51, datetime = 1900-01-18 04:00:00, uid = IHZEXm2l)\n",
" * SpaceTimeRecord(x = -96, y = 86, datetime = 1900-01-14 22:00:00, uid = DtwMgmpH)\n",
" * SpaceTimeRecord(x = 113, y = 11, datetime = 1900-01-19 00:00:00, uid = OcFalcj8)\n",
" * SpaceTimeRecord(x = -141, y = -26, datetime = 1900-01-08 11:00:00, uid = qoJquq8j)\n",
" * SpaceTimeRecord(x = 92, y = 15, datetime = 1900-01-17 08:00:00, uid = HRF401hH)\n",
" * SpaceTimeRecord(x = -35, y = 37, datetime = 1900-01-04 08:00:00, uid = CXZaSOdh)\n",
" * SpaceTimeRecord(x = 84, y = -7, datetime = 1900-01-07 16:00:00, uid = 2aEjxGwG)\n",
" * SpaceTimeRecord(x = 68, y = 73, datetime = 1900-01-18 17:00:00, uid = Ah7lanWB)\n",
" * SpaceTimeRecord(x = -179, y = 40, datetime = 1900-01-01 11:00:00, uid = HGxSJzf4)\n",
" * SpaceTimeRecord(x = -73, y = 23, datetime = 1900-01-09 12:00:00, uid = qHQ8opO9)\n",
" * SpaceTimeRecord(x = 117, y = -23, datetime = 1900-01-31 06:00:00, uid = ctvs56Fq)\n",
" * SpaceTimeRecord(x = 109, y = 55, datetime = 1900-01-13 14:00:00, uid = C2xXIglD)\n",
" * SpaceTimeRecord(x = 104, y = -10, datetime = 1900-01-06 16:00:00, uid = WEpQKIOV)\n",
" * SpaceTimeRecord(x = 45, y = -71, datetime = 1900-01-29 00:00:00, uid = 7r1UeXRi)\n",
"- with children:\n",
" OctTree:\n",
" - boundary: SpaceTimeRectangle(lon=-90.0, lat=45.0, date=datetime.datetime(1900, 1, 8, 0, 0), lon_range=180.0, lat_range=90.0, dt=datetime.timedelta(days=16))\n",
" - boundary: SpaceTimeRectangle(west=-180, east=0.0, south=0.0, north=90, start=datetime.datetime(1900, 1, 1, 0, 0), end=datetime.datetime(1900, 1, 16, 11, 30))\n",
" - capacity: 10\n",
" - depth: 1\n",
" - max_depth: 25\n",
" - contents:\n",
" - number of elements: 10\n",
" * SpaceTimeRecord(x = -89, y = 62, datetime = 1900-01-02 15:00:00, uid = zo7Thw1L)\n",
" * SpaceTimeRecord(x = -34, y = 62, datetime = 1900-01-13 19:00:00, uid = faiiSA9Y)\n",
" * SpaceTimeRecord(x = -61, y = 54, datetime = 1900-01-07 17:00:00, uid = HwzmXILd)\n",
" * SpaceTimeRecord(x = -154, y = 21, datetime = 1900-01-08 21:00:00, uid = lA7DANvC)\n",
" * SpaceTimeRecord(x = -59, y = 87, datetime = 1900-01-02 23:00:00, uid = GSzuXTLF)\n",
" * SpaceTimeRecord(x = -109, y = 27, datetime = 1900-01-01 21:00:00, uid = qy7npkH7)\n",
" * SpaceTimeRecord(x = -86, y = 46, datetime = 1900-01-10 19:00:00, uid = RJBRR7Rl)\n",
" * SpaceTimeRecord(x = -114, y = 46, datetime = 1900-01-03 05:00:00, uid = Eop56HgI)\n",
" * SpaceTimeRecord(x = -148, y = 49, datetime = 1900-01-08 13:00:00, uid = 3bavQs9B)\n",
" * SpaceTimeRecord(x = -109, y = 61, datetime = 1900-01-06 06:00:00, uid = zaTZk8xi)\n",
" * SpaceTimeRecord(x = -84, y = 38, datetime = 1900-01-15 10:00:00, uid = 63mpq3Kx)\n",
" * SpaceTimeRecord(x = -78, y = 60, datetime = 1900-01-10 01:00:00, uid = vZ8HLu5t)\n",
" * SpaceTimeRecord(x = -89, y = 24, datetime = 1900-01-12 17:00:00, uid = gn2o9tYQ)\n",
" * SpaceTimeRecord(x = -149, y = 7, datetime = 1900-01-08 11:00:00, uid = 2ODnGJO6)\n",
" * SpaceTimeRecord(x = -37, y = 54, datetime = 1900-01-12 13:00:00, uid = 11cApOwm)\n",
" * SpaceTimeRecord(x = -34, y = 88, datetime = 1900-01-03 05:00:00, uid = 8SN6zPWh)\n",
" * SpaceTimeRecord(x = -36, y = 13, datetime = 1900-01-14 13:00:00, uid = ijfjmp8E)\n",
" * SpaceTimeRecord(x = -168, y = 62, datetime = 1900-01-03 09:00:00, uid = Cc4m1azR)\n",
" * SpaceTimeRecord(x = -76, y = 67, datetime = 1900-01-06 04:00:00, uid = 4WeWpZUz)\n",
" * SpaceTimeRecord(x = -156, y = 39, datetime = 1900-01-13 10:00:00, uid = dZXAMaXq)\n",
" - with children:\n",
" OctTree:\n",
" - boundary: SpaceTimeRectangle(lon=-135.0, lat=67.5, date=datetime.datetime(1900, 1, 4, 0, 0), lon_range=90.0, lat_range=45.0, dt=datetime.timedelta(days=8))\n",
" - boundary: SpaceTimeRectangle(west=-180, east=-90.0, south=45.0, north=90, start=datetime.datetime(1900, 1, 1, 0, 0), end=datetime.datetime(1900, 1, 8, 17, 45))\n",
" - capacity: 10\n",
" - depth: 2\n",
" - max_depth: 25\n",
" - contents:\n",
" - number of elements: 10\n",
" * SpaceTimeRecord(x = -93, y = 49, datetime = 1900-01-07 05:00:00, uid = Vq4kU1vN)\n",
" * SpaceTimeRecord(x = -151, y = 84, datetime = 1900-01-03 03:00:00, uid = 1pz9w5ZR)\n",
" * SpaceTimeRecord(x = -154, y = 74, datetime = 1900-01-03 17:00:00, uid = m1jkOrRF)\n",
" * SpaceTimeRecord(x = -121, y = 81, datetime = 1900-01-02 13:00:00, uid = IcrUGFud)\n",
" * SpaceTimeRecord(x = -169, y = 52, datetime = 1900-01-03 12:00:00, uid = Rmytp4VV)\n",
" * SpaceTimeRecord(x = -115, y = 70, datetime = 1900-01-07 17:00:00, uid = XYiNarG0)\n",
" * SpaceTimeRecord(x = -104, y = 51, datetime = 1900-01-02 06:00:00, uid = je7IfMVs)\n",
" * SpaceTimeRecord(x = -161, y = 58, datetime = 1900-01-01 19:00:00, uid = szpJUEjI)\n",
" * SpaceTimeRecord(x = -133, y = 46, datetime = 1900-01-03 07:00:00, uid = vD2DhqWZ)\n",
" * SpaceTimeRecord(x = -125, y = 67, datetime = 1900-01-07 12:00:00, uid = rOJwKqKs)\n",
" * SpaceTimeRecord(x = -141, y = 79, datetime = 1900-01-03 05:00:00, uid = mN1Mg7Vn)\n",
" * SpaceTimeRecord(x = -172, y = 80, datetime = 1900-01-01 14:00:00, uid = NBBZ3bCW)\n",
" * SpaceTimeRecord(x = -93, y = 53, datetime = 1900-01-06 07:00:00, uid = jX8HZPJT)\n",
" * SpaceTimeRecord(x = -168, y = 82, datetime = 1900-01-03 08:00:00, uid = dlxpN1Ew)\n",
" * SpaceTimeRecord(x = -111, y = 83, datetime = 1900-01-02 12:00:00, uid = GXLopHH0)\n",
" * SpaceTimeRecord(x = -178, y = 61, datetime = 1900-01-02 00:00:00, uid = 0ut6CLe5)\n",
" * SpaceTimeRecord(x = -148, y = 74, datetime = 1900-01-07 23:00:00, uid = xUySW1tx)\n",
" * SpaceTimeRecord(x = -174, y = 63, datetime = 1900-01-06 22:00:00, uid = 8sI94Lt6)\n",
" * SpaceTimeRecord(x = -114, y = 84, datetime = 1900-01-05 15:00:00, uid = OoY9mEkQ)\n",
" * SpaceTimeRecord(x = -102, y = 82, datetime = 1900-01-02 15:00:00, uid = bd4sLang)\n",
" - with children:\n",
" OctTree:\n",
" - boundary: SpaceTimeRectangle(lon=-157.5, lat=78.75, date=datetime.datetime(1900, 1, 2, 0, 0), lon_range=45.0, lat_range=22.5, dt=datetime.timedelta(days=4))\n",
" - boundary: SpaceTimeRectangle(west=-180, east=-135.0, south=67.5, north=90, start=datetime.datetime(1900, 1, 1, 0, 0), end=datetime.datetime(1900, 1, 4, 20, 52, 30))\n",
" - capacity: 10\n",
" - depth: 3\n",
" - max_depth: 25\n",
" - contents:\n",
" - number of elements: 10\n",
" * SpaceTimeRecord(x = -141, y = 82, datetime = 1900-01-01 13:00:00, uid = B8slJoTY)\n",
" * SpaceTimeRecord(x = -147, y = 70, datetime = 1900-01-02 00:00:00, uid = bcnBHvsx)\n",
" * SpaceTimeRecord(x = -170, y = 86, datetime = 1900-01-02 17:00:00, uid = jEUfXIsD)\n",
" * SpaceTimeRecord(x = -180, y = 78, datetime = 1900-01-02 23:00:00, uid = TYebBlyX)\n",
" * SpaceTimeRecord(x = -135, y = 68, datetime = 1900-01-01 11:00:00, uid = UtzHGKY0)\n",
" * SpaceTimeRecord(x = -136, y = 85, datetime = 1900-01-01 02:00:00, uid = HxwAfFf7)\n",
" * SpaceTimeRecord(x = -169, y = 71, datetime = 1900-01-03 12:00:00, uid = kGOcDjS4)\n",
" * SpaceTimeRecord(x = -164, y = 79, datetime = 1900-01-03 11:00:00, uid = IFXekuK1)\n",
" * SpaceTimeRecord(x = -138, y = 76, datetime = 1900-01-01 09:00:00, uid = Qs0TDXtf)\n",
" * SpaceTimeRecord(x = -154, y = 71, datetime = 1900-01-01 16:00:00, uid = E6eJ2eiF)\n",
" * SpaceTimeRecord(x = -148, y = 79, datetime = 1900-01-03 21:00:00, uid = kNWm70rm)\n",
" * SpaceTimeRecord(x = -157, y = 80, datetime = 1900-01-03 05:00:00, uid = 471X27tA)\n",
" * SpaceTimeRecord(x = -152, y = 85, datetime = 1900-01-03 01:00:00, uid = cjTyQn7E)\n",
" * SpaceTimeRecord(x = -154, y = 88, datetime = 1900-01-03 15:00:00, uid = JTnjCJZN)\n",
" * SpaceTimeRecord(x = -139, y = 83, datetime = 1900-01-01 21:00:00, uid = kZ28j8I5)\n",
" * SpaceTimeRecord(x = -161, y = 73, datetime = 1900-01-03 02:00:00, uid = wsHJBLLC)\n",
" * SpaceTimeRecord(x = -140, y = 71, datetime = 1900-01-02 07:00:00, uid = 4bTg1N2k)\n",
" * SpaceTimeRecord(x = -141, y = 74, datetime = 1900-01-04 09:00:00, uid = I6M8kuue)\n",
" * SpaceTimeRecord(x = -144, y = 72, datetime = 1900-01-04 17:00:00, uid = 0fPvYOC9)\n",
" * SpaceTimeRecord(x = -157, y = 78, datetime = 1900-01-03 16:00:00, uid = yAL3OeaK)\n",
" - with children:\n",
" OctTree:\n",
" - boundary: SpaceTimeRectangle(lon=-168.75, lat=84.375, date=datetime.datetime(1900, 1, 1, 0, 0), lon_range=22.5, lat_range=11.25, dt=datetime.timedelta(days=2))\n",
" - capacity: 10\n",
" - depth: 4\n",
" - max_depth: 25\n",
" OctTree:\n",
" - boundary: SpaceTimeRectangle(lon=-146.25, lat=84.375, date=datetime.datetime(1900, 1, 1, 0, 0), lon_range=22.5, lat_range=11.25, dt=datetime.timedelta(days=2))\n",
" - boundary: SpaceTimeRectangle(west=-180, east=-157.5, south=78.75, north=90, start=datetime.datetime(1900, 1, 1, 0, 0), end=datetime.datetime(1900, 1, 2, 22, 26, 15))\n",
" - capacity: 10\n",
" - depth: 4\n",
" - max_depth: 25\n",
" - contents:\n",
" - number of elements: 1\n",
" * SpaceTimeRecord(x = -135, y = 89, datetime = 1900-01-01 04:00:00, uid = MUrEpv1f)\n",
" - number of elements: 4\n",
" * SpaceTimeRecord(x = -180, y = 88, datetime = 1900-01-02 12:00:00, uid = CXeAd3y4)\n",
" * SpaceTimeRecord(x = -180, y = 87, datetime = 1900-01-01 16:00:00, uid = TB2xKFgK)\n",
" * SpaceTimeRecord(x = -171, y = 79, datetime = 1900-01-02 04:00:00, uid = pIU8qvxT)\n",
" * SpaceTimeRecord(x = -168, y = 85, datetime = 1900-01-01 22:00:00, uid = 7zL4gz8K)\n",
" OctTree:\n",
" - boundary: SpaceTimeRectangle(lon=-168.75, lat=73.125, date=datetime.datetime(1900, 1, 1, 0, 0), lon_range=22.5, lat_range=11.25, dt=datetime.timedelta(days=2))\n",
" - boundary: SpaceTimeRectangle(west=-157.5, east=-135.0, south=78.75, north=90, start=datetime.datetime(1900, 1, 1, 0, 0), end=datetime.datetime(1900, 1, 2, 22, 26, 15))\n",
" - capacity: 10\n",
" - depth: 4\n",
" - max_depth: 25\n",
" - contents:\n",
" - number of elements: 2\n",
" * SpaceTimeRecord(x = -149, y = 82, datetime = 1900-01-01 20:00:00, uid = xTYMs6Xp)\n",
" * SpaceTimeRecord(x = -154, y = 84, datetime = 1900-01-02 21:00:00, uid = JSEaGBsn)\n",
" OctTree:\n",
" - boundary: SpaceTimeRectangle(lon=-146.25, lat=73.125, date=datetime.datetime(1900, 1, 1, 0, 0), lon_range=22.5, lat_range=11.25, dt=datetime.timedelta(days=2))\n",
" - boundary: SpaceTimeRectangle(west=-180, east=-157.5, south=67.5, north=78.75, start=datetime.datetime(1900, 1, 1, 0, 0), end=datetime.datetime(1900, 1, 2, 22, 26, 15))\n",
" - capacity: 10\n",
" - depth: 4\n",
" - max_depth: 25\n",
" OctTree:\n",
" - boundary: SpaceTimeRectangle(lon=-168.75, lat=84.375, date=datetime.datetime(1900, 1, 3, 0, 0), lon_range=22.5, lat_range=11.25, dt=datetime.timedelta(days=2))\n",
" - capacity: 10\n",
" - depth: 4\n",
" - max_depth: 25\n"
" - contents:\n",
" - number of elements: 3\n",
" * SpaceTimeRecord(x = -173, y = 75, datetime = 1900-01-01 06:00:00, uid = M4N3amQ3)\n"
]
}
],
......@@ -301,7 +301,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"224 μs ± 6.15 μs per loop (mean ± std. dev. of 7 runs, 1,000 loops each)\n"
"207 μs ± 6.25 μs per loop (mean ± std. dev. of 7 runs, 1,000 loops each)\n"
]
}
],
......@@ -601,7 +601,7 @@
"name": "stdout",
"output_type": "stream",
"text": [
"5.4 ms ± 19.5 μs per loop (mean ± std. dev. of 7 runs, 100 loops each)\n"
"5.36 ms ± 164 μs per loop (mean ± std. dev. of 7 runs, 100 loops each)\n"
]
}
],
......@@ -631,8 +631,8 @@
"name": "stdout",
"output_type": "stream",
"text": [
"CPU times: user 2.5 s, sys: 228 ms, total: 2.73 s\n",
"Wall time: 2.65 s\n"
"CPU times: user 2.52 s, sys: 253 ms, total: 2.78 s\n",
"Wall time: 2.66 s\n"
]
}
],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment