From 7914d009789e831b9c05e2f119ede39ad188b917 Mon Sep 17 00:00:00 2001 From: "a.ott" Date: Tue, 8 Sep 2020 18:30:57 +0200 Subject: [PATCH] consolidate f_zero curve weighting include 0 when rejecting invalid parameter values --- Fitter.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Fitter.py b/Fitter.py index 2e81c96..60f5119 100644 --- a/Fitter.py +++ b/Fitter.py @@ -137,7 +137,7 @@ class Fitter: def cost_function_all(self, X, error_weights=None): for i in range(len(X)): - if X[i] < 0: + if X[i] <= 0: print("tried impossible value") return 1000 + abs(X[i]) * 10000 @@ -219,7 +219,7 @@ class Fitter: / abs(self.f_zero_slope_at_straight+1) error_f_zero = calculate_list_error(f_zeros, self.f_zero_values) / 10 - error_f0_curve = self.calculate_f0_curve_error(model, fi_curve_model) / 10 + error_f0_curve = self.calculate_f0_curve_error(model, fi_curve_model) / 1000 error_list = [error_vs, error_sc, error_cv, error_hist, error_bursty, error_f_inf, error_f_inf_slope, error_f_zero, error_f_zero_slope_at_straight, error_f0_curve] @@ -290,7 +290,7 @@ class Fitter: elif len(model_curve) < len(cell_curve): cell_curve = cell_curve[:len(model_curve)] - error_f0_curve = np.mean((model_curve - cell_curve) ** 2) / 100 + error_f0_curve = np.mean((model_curve - cell_curve) ** 2) return error_f0_curve