From 4fad5d1789f470c909ec2ba6e2c58ca515112562 Mon Sep 17 00:00:00 2001 From: stevenhua0320 Date: Mon, 19 Aug 2024 15:57:42 +0800 Subject: [PATCH 1/2] fix false counting and numpy to int --- src/diffpy/srmise/baselines/polynomial.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/diffpy/srmise/baselines/polynomial.py b/src/diffpy/srmise/baselines/polynomial.py index 70498be..5805cf3 100644 --- a/src/diffpy/srmise/baselines/polynomial.py +++ b/src/diffpy/srmise/baselines/polynomial.py @@ -90,7 +90,7 @@ def estimate_parameters(self, r, y): # TODO: Make this more sophisticated. try: cut = np.max([len(y) / 10, 1]) - cut_idx = y.argsort()[:cut] + cut_idx = y.argsort()[:int(cut)] import numpy.linalg as la @@ -121,7 +121,7 @@ def _jacobianraw(self, pars, r, free): emsg = "Argument free must have " + str(self.npars) + " elements." raise ValueError(emsg) jacobian = [None for p in range(self.npars)] - if (free is False).sum() == self.npars: + if np.sum(np.logical_not(free)) == self.npars: return jacobian # The partial derivative with respect to the nth coefficient of a From 889a6ea6340f5c243a7f56421e9fe1972f1562fc Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 07:59:24 +0000 Subject: [PATCH 2/2] [pre-commit.ci] auto fixes from pre-commit hooks --- src/diffpy/srmise/baselines/polynomial.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/diffpy/srmise/baselines/polynomial.py b/src/diffpy/srmise/baselines/polynomial.py index 5805cf3..bae1b6f 100644 --- a/src/diffpy/srmise/baselines/polynomial.py +++ b/src/diffpy/srmise/baselines/polynomial.py @@ -90,7 +90,7 @@ def estimate_parameters(self, r, y): # TODO: Make this more sophisticated. try: cut = np.max([len(y) / 10, 1]) - cut_idx = y.argsort()[:int(cut)] + cut_idx = y.argsort()[: int(cut)] import numpy.linalg as la