debug batchpeaktopeak

CyrilJl · Jun 26, 2024 · e3935a8 · e3935a8
1 parent 92f01c8
commit e3935a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/batchstats/stats.py b/batchstats/stats.py
@@ -270,8 +270,9 @@ def update_batch(self, batch, assume_valid=False):
             BatchPeakToPeak: Updated BatchPeakToPeak object.
 
         """
-        self.batchmax.update_batch(batch, assume_valid=assume_valid)
-        self.batchmin.update_batch(batch, assume_valid=assume_valid)
+        valid_batch = self._process_batch(batch=batch, assume_valid=assume_valid)
+        self.batchmax.update_batch(batch, assume_valid=True)
+        self.batchmin.update_batch(batch, assume_valid=True)
         return self
 
     def __call__(self) -> np.ndarray:

diff --git a/tests/test_merge.py b/tests/test_merge.py
@@ -1,20 +1,20 @@
 import numpy as np
 import pytest
 
-from batchstats import BatchCov, BatchMax, BatchMean, BatchMin, BatchStd, BatchSum, BatchVar
+from batchstats import BatchCov, BatchMax, BatchMean, BatchMin, BatchPeakToPeak, BatchStd, BatchSum, BatchVar
 
 
 @pytest.fixture
 def data():
     m, n = 25_000, 50
-    return np.random.randn(m, n), np.random.randn(m, n)
+    return np.random.randn(m, n), np.random.randn(2*m, n)
 
 
 def test_merge(data):
     data1, data2 = data
-    for stat in (BatchCov, BatchMax, BatchMean, BatchMin, BatchStd, BatchSum, BatchVar):
-        print(stat)
-        s0 = stat().update_batch(np.concatenate([data1, data2]))
+    data0 = np.concatenate([data1, data2])
+    for stat in (BatchCov, BatchMax, BatchMean, BatchMin, BatchPeakToPeak, BatchStd, BatchSum, BatchVar):
+        s0 = stat().update_batch(data0)
         s1 = stat().update_batch(data1)
         s2 = stat().update_batch(data2)
         s3 = s1 + s2