output discover sum_E or E

scikit-mine · Mar 17, 2023 · 50865d3 · 50865d3
1 parent 24e4d05
commit 50865d3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/skmine/periodic/cycles.py b/skmine/periodic/cycles.py
@@ -180,7 +180,8 @@ def discover(self, dE_sum=True, chronological_order=True):
                 start       when the cycle starts
                 length      number of occurrences in the event
                 period      inter-occurrence delay
-                dE          shift corrections
+                sum_E       absolute sum of errors
+                E           shift corrections (if dE_sum=False)
                 cost        MDL cost
                 ==========  ======================================
 
@@ -216,7 +217,8 @@ def to_timedelta(x): return pd.to_timedelta(x, unit='ns')
 
                 self.cycles["E"] = self.cycles["E"].apply(lambda x: list(map(to_timedelta, x)))
         if dE_sum:
-            self.cycles["E"] = self.cycles["E"].apply(lambda x: np.sum(np.abs(x)))
+            self.cycles.rename(columns={"E": "sum_E"}, inplace=True)
+            self.cycles["sum_E"] = self.cycles["sum_E"].apply(lambda x: np.sum(np.abs(x)))
 
         if chronological_order:
             self.cycles.sort_values(by='t0', inplace=True)

diff --git a/skmine/periodic/tests/test_cycles.py b/skmine/periodic/tests/test_cycles.py
@@ -87,7 +87,7 @@ def test_discover(data):
     assert res_discover["pattern"].dtypes.name == "object"
     assert res_discover["repetition_major"].dtypes.name == "int64"
     assert res_discover["period_major"].dtypes.name == "timedelta64[ns]"
-    assert res_discover["E"].dtypes.name == "timedelta64[ns]"
+    assert res_discover["sum_E"].dtypes.name == "timedelta64[ns]"
 
     res_discover = pcm.discover(dE_sum=False)
     assert res_discover["E"].dtypes.name == "object"