Commit 91020271 authored by Laurent Belcour's avatar Laurent Belcour
Browse files

Chaning sequential quadratic programming to be the default behaviour

of the nlopt solver instead of MMA.
parent 008a06a4
...@@ -180,14 +180,17 @@ bool nonlinear_fitter_nlopt::fit_data(const data* d, function* fit, const argume ...@@ -180,14 +180,17 @@ bool nonlinear_fitter_nlopt::fit_data(const data* d, function* fit, const argume
{ {
algorithm = NLOPT_GN_CRS2_LM; algorithm = NLOPT_GN_CRS2_LM;
} }
else if(optimizerName == "MMA")
{
algorithm = NLOPT_LD_MMA;
}
else if(optimizerName == "SQP") else if(optimizerName == "SQP")
{ {
algorithm = NLOPT_LD_SLSQP; algorithm = NLOPT_LD_SLSQP;
} }
else else
{ {
// The default option one can find in the NLOpt documentation algorithm = NLOPT_LD_SLSQP;
algorithm = NLOPT_LD_MMA;
} }
// Create the optimizer // Create the optimizer
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment