Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Param regression bug fix #18

Open
wants to merge 16 commits into
base: main
Choose a base branch
from
Open

Param regression bug fix #18

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d3a5927
Fixed PR changes for params_regression
tanzim10 Oct 1, 2024
fabd34b
Fixed Unittest for param_regression according to PR change
tanzim10 Oct 1, 2024
71f6c96
Fixed the mobility notebook and radp_library file(PR changes done)
tanzim10 Oct 1, 2024
deb3bc3
Resolved test_param_regression unittest cases
tanzim10 Oct 2, 2024
064e285
Updated Param Regression and radp library as instructed in the PR review
tanzim10 Oct 4, 2024
f774355
Changed the scipy dependency to solve dependency error
tanzim10 Oct 4, 2024
962e4db
Changed how seed value works especially made it user friendly
tanzim10 Oct 4, 2024
625be10
Refactored functions and changed the imports
tanzim10 Oct 11, 2024
9d507a1
Resolved test_param_regression imports
tanzim10 Oct 11, 2024
7ff9c34
All Black Changes
tanzim10 Oct 11, 2024
831f215
Merge branch 'main' into PR-Changes
tanzim10 Oct 11, 2024
d6bb401
Merge pull request #1 from tanzim10/PR-Changes
tanzim10 Oct 11, 2024
77bce45
Merge pull request #3 from lf-connectivity/main
tanzim10 Oct 23, 2024
3f6be06
Merge remote-tracking branch 'upstream/main'
tanzim10 Oct 28, 2024
82d6ce6
Merge branch 'main' of https://github.com/tanzim10/maveric
tanzim10 Oct 28, 2024
6103d1e
Fixed the dist function bug in param_regression
tanzim10 Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions radp/digital_twin/mobility/param_regression.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading