From cddf6ddf6b60a69db6b663ecbd6128683cdc8a6f Mon Sep 17 00:00:00 2001 From: Fabian Joswig Date: Tue, 12 Oct 2021 14:12:21 +0100 Subject: [PATCH] further instances of np.float removed --- pyerrors/fits.py | 6 +++--- pyerrors/misc.py | 2 +- pyerrors/pyerrors.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pyerrors/fits.py b/pyerrors/fits.py index 1faf1d3b..137ede2f 100644 --- a/pyerrors/fits.py +++ b/pyerrors/fits.py @@ -256,7 +256,7 @@ def odr_fit(x, y, func, silent=False, **kwargs): data = RealData(x_f, y_f, sx=dx_f, sy=dy_f) model = Model(func) - odr = ODR(data, model, x0, partol=np.finfo(np.float).eps) + odr = ODR(data, model, x0, partol=np.finfo(np.float64).eps) odr.set_job(fit_type=0, deriv=1) output = odr.run() @@ -610,7 +610,7 @@ def covariance_matrix(y): def error_band(x, func, beta): """Returns the error band for an array of sample values x, for given fit function func with optimized parameters beta.""" cov = covariance_matrix(beta) - if np.any(np.abs(cov - cov.T) > 1000 * np.finfo(np.float).eps): + if np.any(np.abs(cov - cov.T) > 1000 * np.finfo(np.float64).eps): print('Warning, Covariance matrix is not symmetric within floating point precision') print('cov - cov.T:') print(cov - cov.T) @@ -716,7 +716,7 @@ def fit_general(x, y, func, silent=False, **kwargs): model = Model(func) - odr = ODR(data, model, beta0, partol=np.finfo(np.float).eps) + odr = ODR(data, model, beta0, partol=np.finfo(np.float64).eps) odr.set_job(fit_type=fit_type, deriv=1) output = odr.run() if print_output and not silent: diff --git a/pyerrors/misc.py b/pyerrors/misc.py index b393e49f..a4d71a5f 100644 --- a/pyerrors/misc.py +++ b/pyerrors/misc.py @@ -71,7 +71,7 @@ def ks_test(obs=None): plt.ylabel('Cumulative probability') plt.title(str(bins) + ' Q values') - n = np.arange(1, bins + 1) / np.float(bins) + n = np.arange(1, bins + 1) / np.float64(bins) Xs = np.sort(Qs) plt.step(Xs, n) diffs = n - Xs diff --git a/pyerrors/pyerrors.py b/pyerrors/pyerrors.py index b7b52f82..947be666 100644 --- a/pyerrors/pyerrors.py +++ b/pyerrors/pyerrors.py @@ -297,7 +297,7 @@ class Obs: self.e_windowsize[e_name] = n break - if len(self.e_content[e_name]) > 1 and self.e_dvalue[e_name] > np.finfo(np.float).eps: + if len(self.e_content[e_name]) > 1 and self.e_dvalue[e_name] > np.finfo(np.float64).eps: e_mean = 0 for r_name in self.e_content[e_name]: e_mean += self.shape[r_name] * self.r_values[r_name]