Skip to content

Commit

Permalink
Correct calculation number of infractions last 5 years
Browse files Browse the repository at this point in the history
  • Loading branch information
VincentAntoine committed Sep 27, 2021
1 parent db1c1a5 commit 756b325
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions datascience/src/pipeline/flows/control_anteriority.py
Original file line number Diff line number Diff line change
Expand Up @@ -400,13 +400,20 @@ def compute_control_statistics(controls: pd.DataFrame) -> pd.DataFrame:
"escort_to_quay": False,
}
)
.assign(number_infractions_last_5_years=lambda x: x.infraction_ids.map(len))
.groupby("vessel_id")[
["id", "infraction", "diversion", "seizure", "escort_to_quay"]
[
"id",
"number_infractions_last_5_years",
"diversion",
"seizure",
"escort_to_quay",
]
]
.agg(
{
"id": "count",
"infraction": "sum",
"number_infractions_last_5_years": "sum",
"diversion": "sum",
"seizure": "sum",
"escort_to_quay": "sum",
Expand All @@ -415,7 +422,6 @@ def compute_control_statistics(controls: pd.DataFrame) -> pd.DataFrame:
.rename(
columns={
"id": "number_controls_last_5_years",
"infraction": "number_infractions_last_5_years",
"diversion": "number_diversions_last_5_years",
"seizure": "number_seizures_last_5_years",
"escort_to_quay": "number_escorts_to_quay_last_5_years",
Expand Down

0 comments on commit 756b325

Please sign in to comment.