Merge branch 'release/v14.79'
This commit is contained in:
@@ -327,13 +327,13 @@ def getagegrouprecord(age,sex='male',weightcategory='hwt',
|
||||
p1, success = optimize.leastsq(errfunc,p0[:],
|
||||
args = (ages,powers))
|
||||
|
||||
if success:
|
||||
if success and age is not None:
|
||||
power = fitfunc(p1, float(age))
|
||||
|
||||
#power = np.polyval(poly_coefficients,age)
|
||||
|
||||
power = 0.5*(np.abs(power)+power)
|
||||
else:
|
||||
elif age is not None:
|
||||
new_age = np.range([age])
|
||||
ww = griddata(ages.values,
|
||||
powers.values,
|
||||
|
||||
Reference in New Issue
Block a user