flowtracks 1.5.2.dev1__tar.gz → 1.5.2.dev2__tar.gz

{flowtracks-1.5.2.dev1/flowtracks.egg-info → flowtracks-1.5.2.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flowtracks
-Version: 1.5.2.dev1
+Version: 1.5.2.dev2
 Summary: Library for handling 3D PTV trajectory databases and Lagrangian/Eulerian turbulence post-processing.
 Author-email: Yosef Meller <yosefm@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{flowtracks-1.5.2.dev1 → flowtracks-1.5.2.dev2}/flowtracks/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.5.2.dev1'
-__version_tuple__ = version_tuple = (1, 5, 2, 'dev1')
+__version__ = version = '1.5.2.dev2'
+__version_tuple__ = version_tuple = (1, 5, 2, 'dev2')
 
-__commit_id__ = commit_id = 'g647525d37'
+__commit_id__ = commit_id = 'gd0fd559b2'

{flowtracks-1.5.2.dev1 → flowtracks-1.5.2.dev2}/flowtracks/smoothing.py

@@ -112,7 +112,12 @@ def savitzky_golay(trajs, fps, window_size, order, min_window=None):
         steps = np.diff(time)
         observed = slice(None)
         if len(steps) and np.any(steps != steps.min()) and steps.min() > 0:
-            grid = np.arange(time[0], time[-1] + steps.min() / 2, steps.min())
+            # grid step must divide every step (frames 37,40,43,46,68: 1, not
+            # 3), or observed frames fall between grid points
+            step = steps.min()
+            if np.all(steps == np.round(steps)):
+                step = np.gcd.reduce(np.round(steps).astype(np.int64))
+            grid = np.arange(time[0], time[-1] + step / 2, step)
             pos = np.column_stack([np.interp(grid, time, pos[:, k]) for k in range(pos.shape[1])])
             observed = np.searchsorted(grid, time)
         if len(pos) < min_window:

{flowtracks-1.5.2.dev1 → flowtracks-1.5.2.dev2/flowtracks.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flowtracks
-Version: 1.5.2.dev1
+Version: 1.5.2.dev2
 Summary: Library for handling 3D PTV trajectory databases and Lagrangian/Eulerian turbulence post-processing.
 Author-email: Yosef Meller <yosefm@gmail.com>
 License:                     GNU GENERAL PUBLIC LICENSE

{flowtracks-1.5.2.dev1 → flowtracks-1.5.2.dev2}/flowtracks.egg-info/scm_version.json

@@ -1,7 +1,7 @@
 {
   "tag": "1.5.1",
-  "distance": 1,
-  "node": "g647525d371016d4949044230ce6f29c58e659e05",
+  "distance": 2,
+  "node": "gd0fd559b28f895d77ee63a74ae23275dc95d148b",
   "dirty": false,
   "branch": "master",
   "node_date": "2026-09-29"

{flowtracks-1.5.2.dev1 → flowtracks-1.5.2.dev2}/tests/test_smoothing.py

@@ -142,6 +142,16 @@ class TestSavitzkyGolay(unittest.TestCase):
         np.testing.assert_allclose(sm.velocity()[far], vel[far], atol=1e-6)
         self.assertLess(np.abs(sm.velocity() - vel).max(), 0.05 * np.abs(vel).max())
 
+    def test_gap_not_a_multiple_of_smallest_step(self):
+        """Frames 37, 40, 43, 46, 68: the fill grid must reach frame 68
+        (step 1), not stop at 67 on a step-3 grid (was an IndexError)."""
+        t = np.array([37, 40, 43, 46, 68], dtype=np.float64)
+        pos = np.column_stack([2.0 * t, -t, np.ones(5)])
+        sm = smoothing.savitzky_golay([Trajectory(pos, np.zeros_like(pos), t, 0)],
+                                      fps=1., window_size=9, order=3, min_window=5)[0]
+        np.testing.assert_array_equal(sm.time(), t)
+        np.testing.assert_allclose(sm.velocity(), np.tile([2.0, -1.0, 0.0], (5, 1)), atol=1e-9)
+
     def test_short_trajectory_dropped(self):
         t = np.arange(3, dtype=np.float64)
         traj = Trajectory(np.random.default_rng(1).normal(size=(3, 3)),