Fixed #1045 Added raw P_ attr to stimp

Author: seanlaw

stumpy/aamp_stimp.py

@@ -348,6 +348,26 @@ def M_(self):
         """
         return self._M.astype(np.int64)
 
+    @property
+    def P_(self):
+        """
+        Get all of the raw (i.e., non-transformed) matrix profiles matrix profile in
+        (breadth first searched (level) ordered)
+
+        Parameters
+        ----------
+        None
+
+        Returns
+        -------
+        None
+        """
+        P = []
+        for i, idx in enumerate(self._bfs_indices):
+            P.append(self._PAN[idx][: len(self._T) - self._M[i] + 1])
+
+        return P
+
     # @property
     # def bfs_indices_(self):
     #     """

stumpy/stimp.py

@@ -360,6 +360,26 @@ def M_(self):
         """
         return self._M.astype(np.int64)
 
+    @property
+    def P_(self):
+        """
+        Get all of the raw (i.e., non-transformed) matrix profiles matrix profile in
+        (breadth first searched (level) ordered)
+
+        Parameters
+        ----------
+        None
+
+        Returns
+        -------
+        None
+        """
+        P = []
+        for i, idx in enumerate(self._bfs_indices):
+            P.append(self._PAN[idx][: len(self._T) - self._M[i] + 1])
+
+        return P
+
     # @property
     # def bfs_indices_(self):
     #     """

tests/test_aamp_stimp.py

@@ -158,7 +158,7 @@ def test_aamp_stimp_100_percent(T):
         max_m=None,
         step=1,
         percentage=percentage,
-        pre_scraamp=True,
+        pre_scraamp=False,
     )
 
     for i in range(n):
@@ -197,6 +197,37 @@ def test_aamp_stimp_100_percent(T):
     npt.assert_almost_equal(ref_pan, cmp_pan)
 
 
+@pytest.mark.parametrize("T", T)
+def test_stimp_raw_mp(T):
+    """
+    Check pan.P_ attribute for raw matrix profile
+    """
+    percentage = 1.0
+    min_m = 3
+    n = 5
+
+    pan = aamp_stimp(
+        T,
+        min_m=min_m,
+        max_m=None,
+        step=1,
+        percentage=percentage,
+        pre_scraamp=False,
+    )
+
+    for i in range(n):
+        pan.update()
+
+    for idx, m in enumerate(pan.M_[:n]):
+        zone = int(np.ceil(m / 4))
+        ref_P_ = naive.aamp(T, m, T_B=None, exclusion_zone=zone)[:, 0]
+        cmp_P_ = pan.P_[idx]
+
+        naive.replace_inf(ref_P_)
+        naive.replace_inf(cmp_P_)
+        npt.assert_almost_equal(ref_P_, cmp_P_)
+
+
 @pytest.mark.filterwarnings("ignore:numpy.dtype size changed")
 @pytest.mark.filterwarnings("ignore:numpy.ufunc size changed")
 @pytest.mark.filterwarnings("ignore:numpy.ndarray size changed")

tests/test_stimp.py

@@ -148,7 +148,7 @@ def test_stimp_100_percent(T):
         max_m=None,
         step=1,
         percentage=percentage,
-        pre_scrump=True,
+        pre_scrump=False,
         # normalize=True,
     )
 
@@ -182,6 +182,38 @@ def test_stimp_100_percent(T):
     npt.assert_almost_equal(ref_pan, cmp_pan)
 
 
+@pytest.mark.parametrize("T", T)
+def test_stimp_raw_mp(T):
+    """
+    Check pan.P_ attribute for raw matrix profile
+    """
+    percentage = 1.0
+    min_m = 3
+    n = 5
+
+    pan = stimp(
+        T,
+        min_m=min_m,
+        max_m=None,
+        step=1,
+        percentage=percentage,
+        pre_scrump=False,
+        # normalize=True,
+    )
+
+    for i in range(n):
+        pan.update()
+
+    for idx, m in enumerate(pan.M_[:n]):
+        zone = int(np.ceil(m / 4))
+        ref_P_ = naive.stump(T, m, T_B=None, exclusion_zone=zone)[:, 0]
+        cmp_P_ = pan.P_[idx]
+
+        naive.replace_inf(ref_P_)
+        naive.replace_inf(cmp_P_)
+        npt.assert_almost_equal(ref_P_, cmp_P_)
+
+
 @pytest.mark.filterwarnings("ignore:numpy.dtype size changed")
 @pytest.mark.filterwarnings("ignore:numpy.ufunc size changed")
 @pytest.mark.filterwarnings("ignore:numpy.ndarray size changed")