Skip to content

Commit 6e874f0

Browse files
authored
Export column identifiers in all (#374)
* Add column identifiers to be directly exported in pedpy module * Update usages of column_identifier on the website
1 parent 65eb27d commit 6e874f0

3 files changed

Lines changed: 66 additions & 8 deletions

File tree

notebooks/getting_started.ipynb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,8 +524,7 @@
524524
},
525525
"outputs": [],
526526
"source": [
527-
"from pedpy.column_identifier import DENSITY_COL\n",
528-
"from pedpy import plot_voronoi_cells\n",
527+
"from pedpy import plot_voronoi_cells, DENSITY_COL\n",
529528
"import matplotlib.pyplot as plt\n",
530529
"\n",
531530
"plot_voronoi_cells(\n",
@@ -616,7 +615,7 @@
616615
"name": "python",
617616
"nbconvert_exporter": "python",
618617
"pygments_lexer": "ipython3",
619-
"version": "3.11.5"
618+
"version": "3.12.4"
620619
}
621620
},
622621
"nbformat": 4,

notebooks/user_guide.ipynb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -940,8 +940,7 @@
940940
},
941941
"outputs": [],
942942
"source": [
943-
"from pedpy.column_identifier import ID_COL, FRAME_COL, DENSITY_COL\n",
944-
"from pedpy import plot_voronoi_cells\n",
943+
"from pedpy import plot_voronoi_cells, ID_COL, FRAME_COL, DENSITY_COL\n",
945944
"import matplotlib as mpl\n",
946945
"import matplotlib.pyplot as plt\n",
947946
"\n",
@@ -4145,7 +4144,7 @@
41454144
"metadata": {},
41464145
"outputs": [],
41474146
"source": [
4148-
"from pedpy.column_identifier import *\n",
4147+
"from pedpy import ID_COL, FRAME_COL, POINT_COL\n",
41494148
"\n",
41504149
"# Access with column identifier\n",
41514150
"traj.data[[ID_COL, FRAME_COL, POINT_COL]]"
@@ -4254,7 +4253,7 @@
42544253
},
42554254
"outputs": [],
42564255
"source": [
4257-
"from pedpy.column_identifier import SPEED_COL\n",
4256+
"from pedpy import SPEED_COL\n",
42584257
"\n",
42594258
"data_with_voronoi_cells_speed = data_with_voronoi_cells.merge(\n",
42604259
" individual_speed[[ID_COL, FRAME_COL, SPEED_COL]], on=[ID_COL, FRAME_COL]\n",
@@ -4338,7 +4337,7 @@
43384337
},
43394338
"outputs": [],
43404339
"source": [
4341-
"from pedpy.column_identifier import (\n",
4340+
"from pedpy import (\n",
43424341
" X_COL,\n",
43434342
" Y_COL,\n",
43444343
" DENSITY_COL,\n",

pedpy/__init__.py

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,37 @@
1010
__version__ = "unknown"
1111
__commit_hash__ = "unknown"
1212

13+
from .column_identifier import (
14+
A_X_COL,
15+
A_Y_COL,
16+
ACC_COL,
17+
COUNT_COL,
18+
CROSSING_FRAME_COL,
19+
CUMULATED_COL,
20+
DENSITY_COL,
21+
DISTANCE_COL,
22+
END_POSITION_COL,
23+
FIRST_FRAME_COL,
24+
FLOW_COL,
25+
FRAME_COL,
26+
ID_COL,
27+
INTERSECTION_COL,
28+
LAST_FRAME_COL,
29+
MEAN_SPEED_COL,
30+
MID_FRAME_COL,
31+
MID_POSITION_COL,
32+
NEIGHBORS_COL,
33+
POINT_COL,
34+
POLYGON_COL,
35+
SPEED_COL,
36+
START_POSITION_COL,
37+
TIME_COL,
38+
V_X_COL,
39+
V_Y_COL,
40+
WINDOW_SIZE_COL,
41+
X_COL,
42+
Y_COL,
43+
)
1344
from .data.geometry import MeasurementArea, MeasurementLine, WalkableArea
1445
from .data.trajectory_data import TrajectoryData
1546
from .io.trajectory_loader import (
@@ -149,5 +180,34 @@
149180
"plot_voronoi_cells",
150181
"plot_walkable_area",
151182
"plot_acceleration",
183+
"ID_COL",
184+
"FRAME_COL",
185+
"X_COL",
186+
"Y_COL",
187+
"POINT_COL",
188+
"DENSITY_COL",
189+
"POLYGON_COL",
190+
"INTERSECTION_COL",
191+
"COUNT_COL",
192+
"CUMULATED_COL",
193+
"TIME_COL",
194+
"SPEED_COL",
195+
"V_X_COL",
196+
"V_Y_COL",
197+
"FLOW_COL",
198+
"MEAN_SPEED_COL",
199+
"ACC_COL",
200+
"A_X_COL",
201+
"A_Y_COL",
202+
"FIRST_FRAME_COL",
203+
"MID_FRAME_COL",
204+
"LAST_FRAME_COL",
205+
"NEIGHBORS_COL",
206+
"DISTANCE_COL",
207+
"CROSSING_FRAME_COL",
208+
"START_POSITION_COL",
209+
"MID_POSITION_COL",
210+
"END_POSITION_COL",
211+
"WINDOW_SIZE_COL",
152212
"__version__",
153213
]

0 commit comments

Comments
 (0)