Fixed bug.
PAC/NLS routine was only working if the PAC model was named `pacman`.time-shift
parent
11b24a0663
commit
df57bf7eb9
|
@ -193,8 +193,8 @@ else
|
||||||
case 'GaussNewton'
|
case 'GaussNewton'
|
||||||
% Nothing to do here.
|
% Nothing to do here.
|
||||||
case 'lsqnonlin'
|
case 'lsqnonlin'
|
||||||
bounds = ones(length(params0),1)*[-10,10];
|
bounds = ones(length(params0),1)*[-Inf,Inf];
|
||||||
bounds(strcmp(fieldnames(params), M_.param_names(M_.pac.pacman.ec.params)),1) = .0;
|
bounds(strcmp(fieldnames(params), M_.param_names(M_.pac.(pacmodl).ec.params)),1) = .0;
|
||||||
case 'fmincon'
|
case 'fmincon'
|
||||||
if isoctave
|
if isoctave
|
||||||
error('Optimization algorithm ''fmincon'' is not available under Octave')
|
error('Optimization algorithm ''fmincon'' is not available under Octave')
|
||||||
|
@ -202,8 +202,8 @@ else
|
||||||
error('Optimization algorithm ''fmincon'' requires the Optimization Toolbox')
|
error('Optimization algorithm ''fmincon'' requires the Optimization Toolbox')
|
||||||
end
|
end
|
||||||
minalgo = 1;
|
minalgo = 1;
|
||||||
bounds = ones(length(params0),1)*[-10,10];
|
bounds = ones(length(params0),1)*[-Inf,Inf];
|
||||||
bounds(strcmp(fieldnames(params), M_.param_names(M_.pac.pacman.ec.params)),1) = .0;
|
bounds(strcmp(fieldnames(params), M_.param_names(M_.pac.(pacmodl).ec.params)),1) = .0;
|
||||||
case 'fminunc'
|
case 'fminunc'
|
||||||
if isoctave && ~user_has_octave_forge_package('optim')
|
if isoctave && ~user_has_octave_forge_package('optim')
|
||||||
error('Optimization algorithm ''fminunc'' requires the optim package')
|
error('Optimization algorithm ''fminunc'' requires the optim package')
|
||||||
|
@ -224,8 +224,8 @@ else
|
||||||
minalgo = 8;
|
minalgo = 8;
|
||||||
case 'annealing'
|
case 'annealing'
|
||||||
minalgo = 2;
|
minalgo = 2;
|
||||||
bounds = ones(length(params0),1)*[-10,10];
|
bounds = ones(length(params0),1)*[-Inf,Inf];
|
||||||
bounds(strcmp(fieldnames(params), M_.param_names(M_.pac.pacman.ec.params)),1) = .0;
|
bounds(strcmp(fieldnames(params), M_.param_names(M_.pac.(pacmodl).ec.params)),1) = .0;
|
||||||
parameter_names = fieldnames(params);
|
parameter_names = fieldnames(params);
|
||||||
case 'particleswarm'
|
case 'particleswarm'
|
||||||
if isoctave
|
if isoctave
|
||||||
|
@ -234,8 +234,8 @@ else
|
||||||
error('Optimization ''particleswarm'' requires the Global Optimization Toolbox')
|
error('Optimization ''particleswarm'' requires the Global Optimization Toolbox')
|
||||||
end
|
end
|
||||||
minalgo = 12;
|
minalgo = 12;
|
||||||
bounds = ones(length(params0),1)*[-10,10];
|
bounds = ones(length(params0),1)*[-Inf,Inf];
|
||||||
bounds(strcmp(fieldnames(params), M_.param_names(M_.pac.pacman.ec.params)),1) = .0;
|
bounds(strcmp(fieldnames(params), M_.param_names(M_.pac.(pacmodl).ec.params)),1) = .0;
|
||||||
parameter_names = fieldnames(params);
|
parameter_names = fieldnames(params);
|
||||||
otherwise
|
otherwise
|
||||||
msg = sprintf('%s is not an implemented optimization routine.\n', optimizer);
|
msg = sprintf('%s is not an implemented optimization routine.\n', optimizer);
|
||||||
|
|
Loading…
Reference in New Issue