updated tests and workflow file

Author: Christoph Heindl

.github/workflows/python-package.yml

@@ -25,7 +25,9 @@ jobs:
                   python-version: ${{ matrix.python-version }}
             - name: Install dependencies
               run: |
-                  python -m pip install --upgrade pip
+                  # The following is commented due to issue in package lap
+                  # python -m pip install --upgrade pip
+                  pip install --upgrade pip==22.0.3
                   python -m pip install flake8 pytest pytest-benchmark        
                   if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
                   pip install lap scipy "ortools<9.4" lapsolver munkres

motmetrics/tests/test_mot.py

@@ -36,62 +36,66 @@ def test_events():
     acc.update([], [], [], frameid=5)
 
     expect = mm.MOTAccumulator.new_event_dataframe()
-    expect.loc[(0, 0), :] = ['RAW', np.nan, np.nan, np.nan]
-    expect.loc[(0, 1), :] = ['RAW', np.nan, 1, np.nan]
-    expect.loc[(0, 2), :] = ['RAW', np.nan, 2, np.nan]
-    expect.loc[(0, 3), :] = ['FP', np.nan, 1, np.nan]
-    expect.loc[(0, 4), :] = ['FP', np.nan, 2, np.nan]
-
-    expect.loc[(1, 0), :] = ['RAW', np.nan, np.nan, np.nan]
-    expect.loc[(1, 1), :] = ['RAW', 1, np.nan, np.nan]
-    expect.loc[(1, 2), :] = ['RAW', 2, np.nan, np.nan]
-    expect.loc[(1, 3), :] = ['MISS', 1, np.nan, np.nan]
-    expect.loc[(1, 4), :] = ['MISS', 2, np.nan, np.nan]
-
-    expect.loc[(2, 0), :] = ['RAW', np.nan, np.nan, np.nan]
-    expect.loc[(2, 1), :] = ['RAW', 1, 1, 1.0]
-    expect.loc[(2, 2), :] = ['RAW', 1, 2, 0.5]
-    expect.loc[(2, 3), :] = ['RAW', 2, 1, 0.3]
-    expect.loc[(2, 4), :] = ['RAW', 2, 2, 1.0]
-    expect.loc[(2, 5), :] = ['MATCH', 1, 2, 0.5]
-    expect.loc[(2, 6), :] = ['MATCH', 2, 1, 0.3]
-
-    expect.loc[(3, 0), :] = ['RAW', np.nan, np.nan, np.nan]
-    expect.loc[(3, 1), :] = ['RAW', 1, 1, 0.2]
-    expect.loc[(3, 2), :] = ['RAW', 2, 2, 0.1]
-    expect.loc[(3, 3), :] = ['TRANSFER', 1, 1, 0.2]
-    expect.loc[(3, 4), :] = ['SWITCH', 1, 1, 0.2]
-    expect.loc[(3, 5), :] = ['TRANSFER', 2, 2, 0.1]
-    expect.loc[(3, 6), :] = ['SWITCH', 2, 2, 0.1]
-
-    expect.loc[(4, 0), :] = ['RAW', np.nan, np.nan, np.nan]
-    expect.loc[(4, 1), :] = ['RAW', 1, 1, 5.]
-    expect.loc[(4, 2), :] = ['RAW', 1, 2, 1.]
-    expect.loc[(4, 3), :] = ['RAW', 2, 1, 1.]
-    expect.loc[(4, 4), :] = ['RAW', 2, 2, 5.]
-    expect.loc[(4, 5), :] = ['MATCH', 1, 1, 5.]
-    expect.loc[(4, 6), :] = ['MATCH', 2, 2, 5.]
-
-    expect.loc[(5, 0), :] = ['RAW', np.nan, np.nan, np.nan]
-
-    pd.util.testing.assert_frame_equal(acc.events, expect)
+    expect.loc[(0, 0), :] = ["RAW", np.nan, np.nan, np.nan]
+    expect.loc[(0, 1), :] = ["RAW", np.nan, 1, np.nan]
+    expect.loc[(0, 2), :] = ["RAW", np.nan, 2, np.nan]
+    expect.loc[(0, 3), :] = ["FP", np.nan, 1, np.nan]
+    expect.loc[(0, 4), :] = ["FP", np.nan, 2, np.nan]
+
+    expect.loc[(1, 0), :] = ["RAW", np.nan, np.nan, np.nan]
+    expect.loc[(1, 1), :] = ["RAW", 1, np.nan, np.nan]
+    expect.loc[(1, 2), :] = ["RAW", 2, np.nan, np.nan]
+    expect.loc[(1, 3), :] = ["MISS", 1, np.nan, np.nan]
+    expect.loc[(1, 4), :] = ["MISS", 2, np.nan, np.nan]
+
+    expect.loc[(2, 0), :] = ["RAW", np.nan, np.nan, np.nan]
+    expect.loc[(2, 1), :] = ["RAW", 1, 1, 1.0]
+    expect.loc[(2, 2), :] = ["RAW", 1, 2, 0.5]
+    expect.loc[(2, 3), :] = ["RAW", 2, 1, 0.3]
+    expect.loc[(2, 4), :] = ["RAW", 2, 2, 1.0]
+    expect.loc[(2, 5), :] = ["MATCH", 1, 2, 0.5]
+    expect.loc[(2, 6), :] = ["MATCH", 2, 1, 0.3]
+
+    expect.loc[(3, 0), :] = ["RAW", np.nan, np.nan, np.nan]
+    expect.loc[(3, 1), :] = ["RAW", 1, 1, 0.2]
+    expect.loc[(3, 2), :] = ["RAW", 2, 2, 0.1]
+    expect.loc[(3, 3), :] = ["TRANSFER", 1, 1, 0.2]
+    expect.loc[(3, 4), :] = ["SWITCH", 1, 1, 0.2]
+    expect.loc[(3, 5), :] = ["TRANSFER", 2, 2, 0.1]
+    expect.loc[(3, 6), :] = ["SWITCH", 2, 2, 0.1]
+
+    expect.loc[(4, 0), :] = ["RAW", np.nan, np.nan, np.nan]
+    expect.loc[(4, 1), :] = ["RAW", 1, 1, 5.0]
+    expect.loc[(4, 2), :] = ["RAW", 1, 2, 1.0]
+    expect.loc[(4, 3), :] = ["RAW", 2, 1, 1.0]
+    expect.loc[(4, 4), :] = ["RAW", 2, 2, 5.0]
+    expect.loc[(4, 5), :] = ["MATCH", 1, 1, 5.0]
+    expect.loc[(4, 6), :] = ["MATCH", 2, 2, 5.0]
+
+    expect.loc[(5, 0), :] = ["RAW", np.nan, np.nan, np.nan]
+
+    pd.testing.assert_frame_equal(acc.events, expect)
 
 
 def test_max_switch_time():
     """Tests max_switch_time option."""
     acc = mm.MOTAccumulator(max_switch_time=1)
     acc.update([1, 2], [1, 2], [[1, 0.5], [0.3, 1]], frameid=1)  # 1->a, 2->b
-    frameid = acc.update([1, 2], [1, 2], [[0.5, np.nan], [np.nan, 0.5]], frameid=2)  # 1->b, 2->a
+    frameid = acc.update(
+        [1, 2], [1, 2], [[0.5, np.nan], [np.nan, 0.5]], frameid=2
+    )  # 1->b, 2->a
 
     df = acc.events.loc[frameid]
-    assert ((df.Type == 'SWITCH') | (df.Type == 'RAW') | (df.Type == 'TRANSFER')).all()
+    assert ((df.Type == "SWITCH") | (df.Type == "RAW") | (df.Type == "TRANSFER")).all()
 
     acc = mm.MOTAccumulator(max_switch_time=1)
     acc.update([1, 2], [1, 2], [[1, 0.5], [0.3, 1]], frameid=1)  # 1->a, 2->b
-    frameid = acc.update([1, 2], [1, 2], [[0.5, np.nan], [np.nan, 0.5]], frameid=5)  # Later frame 1->b, 2->a
+    frameid = acc.update(
+        [1, 2], [1, 2], [[0.5, np.nan], [np.nan, 0.5]], frameid=5
+    )  # Later frame 1->b, 2->a
 
     df = acc.events.loc[frameid]
-    assert ((df.Type == 'MATCH') | (df.Type == 'RAW') | (df.Type == 'TRANSFER')).all()
+    assert ((df.Type == "MATCH") | (df.Type == "RAW") | (df.Type == "TRANSFER")).all()
 
 
 def test_auto_id():
@@ -121,65 +125,191 @@ def test_merge_dataframes():
     acc.update([1, 2], [1, 2], [[1, 0.5], [0.3, 1]], frameid=2)
     acc.update([1, 2], [1, 2], [[0.2, np.nan], [np.nan, 0.1]], frameid=3)
 
-    r, mappings = mm.MOTAccumulator.merge_event_dataframes([acc.events, acc.events], return_mappings=True)
+    r, mappings = mm.MOTAccumulator.merge_event_dataframes(
+        [acc.events, acc.events], return_mappings=True
+    )
 
     expect = mm.MOTAccumulator.new_event_dataframe()
 
-    expect.loc[(0, 0), :] = ['RAW', np.nan, np.nan, np.nan]
-    expect.loc[(0, 1), :] = ['RAW', np.nan, mappings[0]['hid_map'][1], np.nan]
-    expect.loc[(0, 2), :] = ['RAW', np.nan, mappings[0]['hid_map'][2], np.nan]
-    expect.loc[(0, 3), :] = ['FP', np.nan, mappings[0]['hid_map'][1], np.nan]
-    expect.loc[(0, 4), :] = ['FP', np.nan, mappings[0]['hid_map'][2], np.nan]
-
-    expect.loc[(1, 0), :] = ['RAW', np.nan, np.nan, np.nan]
-    expect.loc[(1, 1), :] = ['RAW', mappings[0]['oid_map'][1], np.nan, np.nan]
-    expect.loc[(1, 2), :] = ['RAW', mappings[0]['oid_map'][2], np.nan, np.nan]
-    expect.loc[(1, 3), :] = ['MISS', mappings[0]['oid_map'][1], np.nan, np.nan]
-    expect.loc[(1, 4), :] = ['MISS', mappings[0]['oid_map'][2], np.nan, np.nan]
-
-    expect.loc[(2, 0), :] = ['RAW', np.nan, np.nan, np.nan]
-    expect.loc[(2, 1), :] = ['RAW', mappings[0]['oid_map'][1], mappings[0]['hid_map'][1], 1]
-    expect.loc[(2, 2), :] = ['RAW', mappings[0]['oid_map'][1], mappings[0]['hid_map'][2], 0.5]
-    expect.loc[(2, 3), :] = ['RAW', mappings[0]['oid_map'][2], mappings[0]['hid_map'][1], 0.3]
-    expect.loc[(2, 4), :] = ['RAW', mappings[0]['oid_map'][2], mappings[0]['hid_map'][2], 1.0]
-    expect.loc[(2, 5), :] = ['MATCH', mappings[0]['oid_map'][1], mappings[0]['hid_map'][2], 0.5]
-    expect.loc[(2, 6), :] = ['MATCH', mappings[0]['oid_map'][2], mappings[0]['hid_map'][1], 0.3]
-
-    expect.loc[(3, 0), :] = ['RAW', np.nan, np.nan, np.nan]
-    expect.loc[(3, 1), :] = ['RAW', mappings[0]['oid_map'][1], mappings[0]['hid_map'][1], 0.2]
-    expect.loc[(3, 2), :] = ['RAW', mappings[0]['oid_map'][2], mappings[0]['hid_map'][2], 0.1]
-    expect.loc[(3, 3), :] = ['TRANSFER', mappings[0]['oid_map'][1], mappings[0]['hid_map'][1], 0.2]
-    expect.loc[(3, 4), :] = ['SWITCH', mappings[0]['oid_map'][1], mappings[0]['hid_map'][1], 0.2]
-    expect.loc[(3, 5), :] = ['TRANSFER', mappings[0]['oid_map'][2], mappings[0]['hid_map'][2], 0.1]
-    expect.loc[(3, 6), :] = ['SWITCH', mappings[0]['oid_map'][2], mappings[0]['hid_map'][2], 0.1]
+    expect.loc[(0, 0), :] = ["RAW", np.nan, np.nan, np.nan]
+    expect.loc[(0, 1), :] = ["RAW", np.nan, mappings[0]["hid_map"][1], np.nan]
+    expect.loc[(0, 2), :] = ["RAW", np.nan, mappings[0]["hid_map"][2], np.nan]
+    expect.loc[(0, 3), :] = ["FP", np.nan, mappings[0]["hid_map"][1], np.nan]
+    expect.loc[(0, 4), :] = ["FP", np.nan, mappings[0]["hid_map"][2], np.nan]
+
+    expect.loc[(1, 0), :] = ["RAW", np.nan, np.nan, np.nan]
+    expect.loc[(1, 1), :] = ["RAW", mappings[0]["oid_map"][1], np.nan, np.nan]
+    expect.loc[(1, 2), :] = ["RAW", mappings[0]["oid_map"][2], np.nan, np.nan]
+    expect.loc[(1, 3), :] = ["MISS", mappings[0]["oid_map"][1], np.nan, np.nan]
+    expect.loc[(1, 4), :] = ["MISS", mappings[0]["oid_map"][2], np.nan, np.nan]
+
+    expect.loc[(2, 0), :] = ["RAW", np.nan, np.nan, np.nan]
+    expect.loc[(2, 1), :] = [
+        "RAW",
+        mappings[0]["oid_map"][1],
+        mappings[0]["hid_map"][1],
+        1,
+    ]
+    expect.loc[(2, 2), :] = [
+        "RAW",
+        mappings[0]["oid_map"][1],
+        mappings[0]["hid_map"][2],
+        0.5,
+    ]
+    expect.loc[(2, 3), :] = [
+        "RAW",
+        mappings[0]["oid_map"][2],
+        mappings[0]["hid_map"][1],
+        0.3,
+    ]
+    expect.loc[(2, 4), :] = [
+        "RAW",
+        mappings[0]["oid_map"][2],
+        mappings[0]["hid_map"][2],
+        1.0,
+    ]
+    expect.loc[(2, 5), :] = [
+        "MATCH",
+        mappings[0]["oid_map"][1],
+        mappings[0]["hid_map"][2],
+        0.5,
+    ]
+    expect.loc[(2, 6), :] = [
+        "MATCH",
+        mappings[0]["oid_map"][2],
+        mappings[0]["hid_map"][1],
+        0.3,
+    ]
+
+    expect.loc[(3, 0), :] = ["RAW", np.nan, np.nan, np.nan]
+    expect.loc[(3, 1), :] = [
+        "RAW",
+        mappings[0]["oid_map"][1],
+        mappings[0]["hid_map"][1],
+        0.2,
+    ]
+    expect.loc[(3, 2), :] = [
+        "RAW",
+        mappings[0]["oid_map"][2],
+        mappings[0]["hid_map"][2],
+        0.1,
+    ]
+    expect.loc[(3, 3), :] = [
+        "TRANSFER",
+        mappings[0]["oid_map"][1],
+        mappings[0]["hid_map"][1],
+        0.2,
+    ]
+    expect.loc[(3, 4), :] = [
+        "SWITCH",
+        mappings[0]["oid_map"][1],
+        mappings[0]["hid_map"][1],
+        0.2,
+    ]
+    expect.loc[(3, 5), :] = [
+        "TRANSFER",
+        mappings[0]["oid_map"][2],
+        mappings[0]["hid_map"][2],
+        0.1,
+    ]
+    expect.loc[(3, 6), :] = [
+        "SWITCH",
+        mappings[0]["oid_map"][2],
+        mappings[0]["hid_map"][2],
+        0.1,
+    ]
 
     # Merge duplication
-    expect.loc[(4, 0), :] = ['RAW', np.nan, np.nan, np.nan]
-    expect.loc[(4, 1), :] = ['RAW', np.nan, mappings[1]['hid_map'][1], np.nan]
-    expect.loc[(4, 2), :] = ['RAW', np.nan, mappings[1]['hid_map'][2], np.nan]
-    expect.loc[(4, 3), :] = ['FP', np.nan, mappings[1]['hid_map'][1], np.nan]
-    expect.loc[(4, 4), :] = ['FP', np.nan, mappings[1]['hid_map'][2], np.nan]
-
-    expect.loc[(5, 0), :] = ['RAW', np.nan, np.nan, np.nan]
-    expect.loc[(5, 1), :] = ['RAW', mappings[1]['oid_map'][1], np.nan, np.nan]
-    expect.loc[(5, 2), :] = ['RAW', mappings[1]['oid_map'][2], np.nan, np.nan]
-    expect.loc[(5, 3), :] = ['MISS', mappings[1]['oid_map'][1], np.nan, np.nan]
-    expect.loc[(5, 4), :] = ['MISS', mappings[1]['oid_map'][2], np.nan, np.nan]
-
-    expect.loc[(6, 0), :] = ['RAW', np.nan, np.nan, np.nan]
-    expect.loc[(6, 1), :] = ['RAW', mappings[1]['oid_map'][1], mappings[1]['hid_map'][1], 1]
-    expect.loc[(6, 2), :] = ['RAW', mappings[1]['oid_map'][1], mappings[1]['hid_map'][2], 0.5]
-    expect.loc[(6, 3), :] = ['RAW', mappings[1]['oid_map'][2], mappings[1]['hid_map'][1], 0.3]
-    expect.loc[(6, 4), :] = ['RAW', mappings[1]['oid_map'][2], mappings[1]['hid_map'][2], 1.0]
-    expect.loc[(6, 5), :] = ['MATCH', mappings[1]['oid_map'][1], mappings[1]['hid_map'][2], 0.5]
-    expect.loc[(6, 6), :] = ['MATCH', mappings[1]['oid_map'][2], mappings[1]['hid_map'][1], 0.3]
-
-    expect.loc[(7, 0), :] = ['RAW', np.nan, np.nan, np.nan]
-    expect.loc[(7, 1), :] = ['RAW', mappings[1]['oid_map'][1], mappings[1]['hid_map'][1], 0.2]
-    expect.loc[(7, 2), :] = ['RAW', mappings[1]['oid_map'][2], mappings[1]['hid_map'][2], 0.1]
-    expect.loc[(7, 3), :] = ['TRANSFER', mappings[1]['oid_map'][1], mappings[1]['hid_map'][1], 0.2]
-    expect.loc[(7, 4), :] = ['SWITCH', mappings[1]['oid_map'][1], mappings[1]['hid_map'][1], 0.2]
-    expect.loc[(7, 5), :] = ['TRANSFER', mappings[1]['oid_map'][2], mappings[1]['hid_map'][2], 0.1]
-    expect.loc[(7, 6), :] = ['SWITCH', mappings[1]['oid_map'][2], mappings[1]['hid_map'][2], 0.1]
-
-    pd.util.testing.assert_frame_equal(r, expect)
+    expect.loc[(4, 0), :] = ["RAW", np.nan, np.nan, np.nan]
+    expect.loc[(4, 1), :] = ["RAW", np.nan, mappings[1]["hid_map"][1], np.nan]
+    expect.loc[(4, 2), :] = ["RAW", np.nan, mappings[1]["hid_map"][2], np.nan]
+    expect.loc[(4, 3), :] = ["FP", np.nan, mappings[1]["hid_map"][1], np.nan]
+    expect.loc[(4, 4), :] = ["FP", np.nan, mappings[1]["hid_map"][2], np.nan]
+
+    expect.loc[(5, 0), :] = ["RAW", np.nan, np.nan, np.nan]
+    expect.loc[(5, 1), :] = ["RAW", mappings[1]["oid_map"][1], np.nan, np.nan]
+    expect.loc[(5, 2), :] = ["RAW", mappings[1]["oid_map"][2], np.nan, np.nan]
+    expect.loc[(5, 3), :] = ["MISS", mappings[1]["oid_map"][1], np.nan, np.nan]
+    expect.loc[(5, 4), :] = ["MISS", mappings[1]["oid_map"][2], np.nan, np.nan]
+
+    expect.loc[(6, 0), :] = ["RAW", np.nan, np.nan, np.nan]
+    expect.loc[(6, 1), :] = [
+        "RAW",
+        mappings[1]["oid_map"][1],
+        mappings[1]["hid_map"][1],
+        1,
+    ]
+    expect.loc[(6, 2), :] = [
+        "RAW",
+        mappings[1]["oid_map"][1],
+        mappings[1]["hid_map"][2],
+        0.5,
+    ]
+    expect.loc[(6, 3), :] = [
+        "RAW",
+        mappings[1]["oid_map"][2],
+        mappings[1]["hid_map"][1],
+        0.3,
+    ]
+    expect.loc[(6, 4), :] = [
+        "RAW",
+        mappings[1]["oid_map"][2],
+        mappings[1]["hid_map"][2],
+        1.0,
+    ]
+    expect.loc[(6, 5), :] = [
+        "MATCH",
+        mappings[1]["oid_map"][1],
+        mappings[1]["hid_map"][2],
+        0.5,
+    ]
+    expect.loc[(6, 6), :] = [
+        "MATCH",
+        mappings[1]["oid_map"][2],
+        mappings[1]["hid_map"][1],
+        0.3,
+    ]
+
+    expect.loc[(7, 0), :] = ["RAW", np.nan, np.nan, np.nan]
+    expect.loc[(7, 1), :] = [
+        "RAW",
+        mappings[1]["oid_map"][1],
+        mappings[1]["hid_map"][1],
+        0.2,
+    ]
+    expect.loc[(7, 2), :] = [
+        "RAW",
+        mappings[1]["oid_map"][2],
+        mappings[1]["hid_map"][2],
+        0.1,
+    ]
+    expect.loc[(7, 3), :] = [
+        "TRANSFER",
+        mappings[1]["oid_map"][1],
+        mappings[1]["hid_map"][1],
+        0.2,
+    ]
+    expect.loc[(7, 4), :] = [
+        "SWITCH",
+        mappings[1]["oid_map"][1],
+        mappings[1]["hid_map"][1],
+        0.2,
+    ]
+    expect.loc[(7, 5), :] = [
+        "TRANSFER",
+        mappings[1]["oid_map"][2],
+        mappings[1]["hid_map"][2],
+        0.1,
+    ]
+    expect.loc[(7, 6), :] = [
+        "SWITCH",
+        mappings[1]["oid_map"][2],
+        mappings[1]["hid_map"][2],
+        0.1,
+    ]
+
+    idx = expect.index
+    expect.index = expect.index.set_levels(
+        [idx.levels[0].astype(object), idx.levels[1].astype(object)]
+    )
+    pd.testing.assert_frame_equal(r, expect)