Skip to content

Commit ade64da

Browse files
ndenembray
authored andcommitted
initial changes for astropy#1330
1 parent e27b06a commit ade64da

9 files changed

Lines changed: 291 additions & 405 deletions

File tree

‎astropy/modeling/core.py‎

Lines changed: 74 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,7 @@ class ParametricModel(Model):
359359
"""
360360

361361
linear = False
362+
deriv = None
362363
# Flag that indicates if the model derivatives are given in columns
363364
# or rows
364365
col_deriv = True
@@ -407,6 +408,7 @@ def __init__(self, param_dim=1, **params):
407408
self._constraints['bounds'] = bounds
408409

409410
self._initialize_parameters(params)
411+
410412

411413
@property
412414
def fixed(self):
@@ -549,6 +551,43 @@ def set_joint_parameters(self, jparams):
549551
"""
550552
self.joint = jparams
551553

554+
def _model_to_fit_params(self):
555+
"""
556+
Create a set of parameters to be fitted.
557+
558+
These may be a subset of the model parameters, if some of them are held
559+
constant or tied.
560+
"""
561+
fitparam_indices = range(len(self.param_names))
562+
if any(self.fixed.values()) or any(self.tied.values()):
563+
params = list(self.parameters)
564+
for idx, name in list(enumerate(self.param_names))[::-1]:
565+
if self.fixed[name] or self.tied[name]:
566+
sl = self._param_metrics[name][0]
567+
del params[sl]
568+
del fitparam_indices[idx]
569+
return (np.array(params), fitparam_indices)
570+
else:
571+
return (self.parameters, fitparam_indices)
572+
573+
def fit_parameters(self, fps):
574+
_fit_parameters, _fit_param_indices = self._model_to_fit_params()
575+
if any(self.fixed.values()) or any(self.tied.values()):
576+
self.parameters[_fit_param_indices] = fps
577+
for idx, name in enumerate(self.param_names):
578+
if self.tied[name] != False:
579+
value = self.tied[name](self)
580+
slice_ = self._param_metrics[name][0]
581+
self.parameters[slice_] = value
582+
elif any([tuple(b) != (None, None) for b in self.bounds.values()]):
583+
for name, par in zip(self.param_names, _fit_parameters):
584+
if self.bounds[name] != (None, None):
585+
par = max(par, self.bounds[name][0])
586+
par = min(par, self.bounds[name][1])
587+
setattr(self, name, par)
588+
else:
589+
self.parameters = fps
590+
552591
def _initialize_parameters(self, params):
553592
"""
554593
Initialize the _parameters array that stores raw parameter values for
@@ -595,6 +634,41 @@ def _initialize_parameters(self, params):
595634
for name, value in params.items():
596635
setattr(self, name, value)
597636

637+
def _wrap_deriv(self, params, model, x, y, z=None):
638+
"""
639+
Wraps the method calculating the Jacobian of the function to account
640+
for model constraints.
641+
642+
Currently the only fitter that uses a derivative is the
643+
`NonLinearLSQFitter`. This wrapper may need to be revised when other
644+
fitters using function derivative are added or when the statistic is
645+
separated from the fitting routines.
646+
647+
`~scipy.optimize.leastsq` expects the function derivative to have the
648+
above signature (parlist, (argtuple)). In order to accomodate model
649+
constraints, instead of using p directly, we set the parameter list in
650+
this function.
651+
"""
652+
if any(self.fixed.values()) or any(self.tied.values()):
653+
654+
if z is None:
655+
full_deriv = np.array(self.deriv(x, *self.parameters))
656+
else:
657+
full_deriv = np.array(self.deriv(x, y, *self.parameters))
658+
pars = [getattr(self, name) for name in self.param_names]
659+
fixed = [par.fixed for par in pars]
660+
tied = [par.tied for par in pars]
661+
tied = list(np.where([par.tied != False for par in pars], True, tied))
662+
fix_and_tie = np.logical_or(fixed, tied)
663+
ind = np.logical_not(fix_and_tie)
664+
res = full_deriv[np.nonzero(ind)]
665+
result = [np.ravel(_) for _ in res]
666+
return result
667+
else:
668+
if z is None:
669+
return self.deriv(x, *params)
670+
else:
671+
return [np.ravel(_) for _ in self.deriv(x, y, *params)]
598672

599673
class LabeledInput(dict):
600674
"""
@@ -957,8 +1031,6 @@ class Parametric1DModel(ParametricModel):
9571031
{'parameter_name': 'parameter_value'}
9581032
"""
9591033

960-
deriv = None
961-
9621034
@format_input
9631035
def __call__(self, x):
9641036
"""
@@ -987,7 +1059,6 @@ class Parametric2DModel(ParametricModel):
9871059
{'parameter_name': 'parameter_value'}
9881060
"""
9891061

990-
deriv = None
9911062
n_inputs = 2
9921063
n_outputs = 1
9931064

0 commit comments

Comments
 (0)