From b9f7a90b1ba9658c589ed0cdd8b8f51053630780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Al=C3=A1n=20Mu=C3=B1oz?= <amuoz@ed.ac.uk>
Date: Thu, 19 Aug 2021 20:23:58 +0100
Subject: [PATCH] add tests
Former-commit-id: 1115de5f4cfc796e8014e22be8b0758449e63545
---
core/functions/tracks.py | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/core/functions/tracks.py b/core/functions/tracks.py
index 72bfcce4..730bc8d5 100644
--- a/core/functions/tracks.py
+++ b/core/functions/tracks.py
@@ -168,7 +168,7 @@ def rec_bottom(d, k):
return rec_bottom(d, d[k])
-def join_tracks(tracks, joinable_pairs, drop=False) -> pd.DataFrame:
+def join_tracks(tracks, joinable_pairs, drop=True) -> pd.DataFrame:
"""
Join pairs of tracks from later tps towards the start.
@@ -186,7 +186,7 @@ def join_tracks(tracks, joinable_pairs, drop=False) -> pd.DataFrame:
tmp = copy(tracks)
for target, source in joinable_pairs:
- tmp.loc[target] = join_track_pairs(tmp.loc[target], tmp.loc[source])
+ tmp.loc[target] = join_track_pair(tmp.loc[target], tmp.loc[source])
if drop:
tmp = tmp.drop(source)
@@ -194,9 +194,6 @@ def join_tracks(tracks, joinable_pairs, drop=False) -> pd.DataFrame:
return tmp
-from copy import copy
-
-
def join_track_pair(target, source):
tgt_copy = copy(target)
end = find_1st(target.values[::-1], 0, cmp_larger)
--
GitLab