From 94875b517e91e93cd5328646583168160033adee Mon Sep 17 00:00:00 2001 From: rongxiangsu Date: Mon, 4 Sep 2023 10:40:49 +0800 Subject: [PATCH] add parameter to compute_ppa_speed and compute_ppa_perimeter --- ortega/ortega.py | 16 ++++++++++------ setup.py | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ortega/ortega.py b/ortega/ortega.py index 557cdf3..b60a101 100644 --- a/ortega/ortega.py +++ b/ortega/ortega.py @@ -527,10 +527,12 @@ def __get_spatial_intersect_pairs(self): intersection_pairs = get_spatial_intersect_pairs(self.ellipses_list_id1, self.ellipses_list_id2) return intersection_pairs - def compute_ppa_speed(self): + def compute_ppa_speed(self, lim: List[float] = [0, 0]): + if len(lim) != 2: + raise ValueError("Parameter 'lim' must be a list of two floats!") speed_list = [ - [e.speed for e in self.ellipses_list_id1], - [e.speed for e in self.ellipses_list_id2] + [e.speed for e in self.ellipses_list_id1 if e.speed > lim[0]], + [e.speed for e in self.ellipses_list_id2 if e.speed > lim[1]] ] print(f"Descriptive statistics of PPA speed for id {self.id1}:") print(pd.Series(speed_list[0]).describe()) @@ -538,10 +540,12 @@ def compute_ppa_speed(self): print(pd.Series(speed_list[1]).describe()) return speed_list - def compute_ppa_perimeter(self): + def compute_ppa_perimeter(self, lim: List[float] = [0, 0]): + if len(lim) != 2: + raise ValueError("Parameter 'lim' must be a list of two floats!") size_list = [ - [e.el.length for e in self.ellipses_list_id1], - [e.el.length for e in self.ellipses_list_id2] + [e.el.length for e in self.ellipses_list_id1 if e.el.length > lim[0]], + [e.el.length for e in self.ellipses_list_id2 if e.el.length > lim[1]] ] print(f"Descriptive statistics of PPA perimeter for id {self.id1}:") print(pd.Series(size_list[0]).describe()) diff --git a/setup.py b/setup.py index dd53290..eb371d3 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ if __name__ == "__main__": setup( name='ortega', - version='1.0.13', + version='1.0.14', author='MOVE lab@UCSB', author_email="rongxiangsu@ucsb.edu", packages=["ortega"],