From 6103d1edeb512178271baad74fe66a1d3feda0d6 Mon Sep 17 00:00:00 2001 From: tanzim10 Date: Wed, 30 Oct 2024 12:10:31 +0600 Subject: [PATCH] Fixed the dist function bug in param_regression --- radp/digital_twin/mobility/param_regression.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/radp/digital_twin/mobility/param_regression.py b/radp/digital_twin/mobility/param_regression.py index 41ca9d3..bd22680 100644 --- a/radp/digital_twin/mobility/param_regression.py +++ b/radp/digital_twin/mobility/param_regression.py @@ -124,13 +124,13 @@ def calculate_distances_and_velocities(group: pd.DataFrame) -> pd.DataFrame: group["prev_longitude"] = group["lon"].shift(1) group["prev_latitude"] = group["lat"].shift(1) group["distance"] = group.apply( - lambda row: GISTools.get_log_distance( - row["prev_latitude"], row["prev_longitude"], row["lat"], row["lon"] - ) - if not pd.isna(row["prev_longitude"]) - else 0, - axis=1, - ) + lambda row: GISTools.dist( + (row["prev_latitude"], row["prev_longitude"]), (row["lat"], row["lon"]) + ) * 1000 # Multiplying by 1000 to convert km to m + if not pd.isna(row["prev_longitude"]) else 0, + axis=1, +) + # Assuming time interval between ticks is 1 unit, adjust below if different group["velocity"] = ( group["distance"] / 1