Merge pull request #207 from yfukai/fix_data_conversion_bug

Fixed data conversion bug

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "laptrack"
-version = "0.5.1"
+version = "0.6.0"
 description = "LapTrack"
 authors = ["Yohsuke Fukai <ysk@yfukai.net>"]
 license = "BSD-3-Clause"

src/laptrack/data_conversion.py

@@ -209,8 +209,8 @@ def convert_tree_to_dataframe(
                 splits.append((node, children))
         if len(parents) > 1:
             for parent in parents:
-                if tree2.has_edge(node, parent):
-                    tree2.remove_edge(node, parent)
+                if tree2.has_edge(parent, node):
+                    tree2.remove_edge(parent, node)
             if node not in [p[0] for p in merges]:
                 merges.append((node, parents))
 

tests/test_tracking.py

@@ -127,6 +127,8 @@ def test_reproducing_trackmate(testdata, tracker_class) -> None:
         )
     df = pd.concat(data)
     track_df, split_df, merge_df = lt.predict_dataframe(df, ["x", "y"])
+    assert not any(split_df.duplicated())
+    assert not any(merge_df.duplicated())
     track_df2, split_df2, merge_df2 = convert_tree_to_dataframe(track_tree, coords)
     track_df2 = track_df2.rename(columns={"coord-0": "x", "coord-1": "y"})
     assert all(track_df == track_df2)