Merge pull request #81 from anniegbryant/main

update infinity notation for infotheory + add a "max_time" estimator to the barycentre SPI

Author: joshuabmoore

pyspi/statistics/distance.py

@@ -237,6 +237,8 @@ def __init__(self, mode="euclidean", squared=False, statistic="mean"):
             self._statfn = lambda x: np.nanmean(self._preproc(x))
         elif statistic == "max":
             self._statfn = lambda x: np.nanmax(self._preproc(x))
+        elif statistic == "max_time":
+            self._statfn = lambda x: np.argmax(self._preproc(x))
         else:
             raise NameError(f"Unknown statistic: {statistic}")
 

pyspi/statistics/infotheory.py

@@ -180,7 +180,7 @@ def _compute_joint_entropy(self, data, i, j):
 
         key = self._getkey()
         if key not in data.joint_entropy:
-            data.joint_entropy[key] = np.full((data.n_processes, data.n_processes), -np.infty)
+            data.joint_entropy[key] = np.full((data.n_processes, data.n_processes), -np.inf)
 
         if data.joint_entropy[key][i, j] == -np.inf:
             x, y = data.to_numpy()[[i, j]]