Alexander/P-unit_model
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

consolidate f_zero curve weighting include 0 when rejecting invalid parameter values

Browse Source
This commit is contained in:
a.ott 2020-09-08 18:30:57 +02:00
parent da3295fba7
commit 7914d00978
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Fitter.py
View File

@ -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