Simple-Track 2.0.5__tar.gz → 2.0.7__tar.gz

{simple_track-2.0.5 → simple_track-2.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Simple-Track
-Version: 2.0.5
+Version: 2.0.7
 Summary: Threshold-based object tracking algorithm for 2D data 
 Author-email: Adam Gainford <adam.gainford@reading.ac.uk>, Thorwald Stein <t.h.m.stein@reading.ac.uk>
 License-Expression: MPL-2.0

{simple_track-2.0.5 → simple_track-2.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "Simple-Track"
-version = "2.0.5"
+version = "2.0.7"
 authors = [
   { name="Adam Gainford", email="adam.gainford@reading.ac.uk" },
   { name="Thorwald Stein", email="t.h.m.stein@reading.ac.uk"} 

{simple_track-2.0.5 → simple_track-2.0.7}/src/Simple_Track.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Simple-Track
-Version: 2.0.5
+Version: 2.0.7
 Summary: Threshold-based object tracking algorithm for 2D data 
 Author-email: Adam Gainford <adam.gainford@reading.ac.uk>, Thorwald Stein <t.h.m.stein@reading.ac.uk>
 License-Expression: MPL-2.0

{simple_track-2.0.5 → simple_track-2.0.7}/src/run_simple_track.py

@@ -8,7 +8,9 @@ def run_tracking():
     # Need to make sure that changes don't affect pyproject.toml entry points
     # easiest just to pass the parser in to run_tracking.
     parser = argparse.ArgumentParser(description="Run Simple-Track")
-    parser.add_argument("configs", help="Path to one or more yaml config files.")
+    parser.add_argument(
+        "configs", nargs="+", help="Path to one or more yaml config files."
+    )
     args = parser.parse_args()
 
     for config_path in args.configs:

{simple_track-2.0.5 → simple_track-2.0.7}/src/simpletrack/frame.py

@@ -176,6 +176,8 @@ class Frame:
         # Provisionally set the lifetime field to 1 anywhere there is a feature
         self._lifetime_field = np.zeros_like(self._feature_field)
         self._lifetime_field[self._feature_field > 0] = 1
+        if np.max(self._feature_field) == 0:
+            return
         self.max_id = int(np.max(self._feature_field))
         self.populate_features()
 

{simple_track-2.0.5 → simple_track-2.0.7}/src/simpletrack/track.py

@@ -4,8 +4,6 @@ Run the SimpleTrack algorithm to track objects through a sequence of images
 
 from pathlib import Path
 
-from yaml import safe_load
-
 from simpletrack.flow_solver import FlowSolver
 from simpletrack.frame import Frame, Timeline
 from simpletrack.frame_output import FrameOutputManager
@@ -258,6 +256,9 @@ class Tracker:
             dict:
                 Simple-Track parameters
         """
+
+        from yaml import safe_load
+
         with open(config_path) as input:
             config = safe_load(input)
         self._check_config(config)

{simple_track-2.0.5 → simple_track-2.0.7}/tests/test_frame.py

@@ -200,6 +200,39 @@ def test_populate_features_with_no_feature_field():
         )
 
 
+def test_populate_features_with_feature_field_but_no_identifiable_features():
+    test_time = dt.datetime.now()
+    test_frame = Frame()
+    test_frame.time = test_time
+
+    test_feature_field = np.zeros((10, 10))
+    test_frame.feature_field = test_feature_field
+
+    test_frame.populate_features()
+
+    if len(test_frame.features) != 0:
+        raise TypeError(
+            f"No features expected for this test, got {len(test_frame.get_features())}"
+        )
+
+
+def test_identify_and_populate_features_with_raw_field_but_no_identifiable_features():
+    test_time = dt.datetime.now()
+    test_frame = Frame()
+    test_frame.time = test_time
+
+    test_raw_field = np.zeros((10, 10))
+    test_frame.raw_field = test_raw_field
+
+    test_frame.identify_features(threshold=1, min_size=1)
+    # test_frame.populate_features() automatically happens within identify_features
+
+    if len(test_frame.features) != 0:
+        raise TypeError(
+            f"No features expected for this test, got {len(test_frame.get_features())}"
+        )
+
+
 def test_assign_displacements_valid_inputs():
     test_frame = Frame()
     y_flow = np.ones((10, 10))