Skip to content

Commit 0ca8486

Browse files
committed
Add method parameter to optimize_loss_function for flexibility in optimization method
1 parent 885e592 commit 0ca8486

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

essos/optimization.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def new_nearaxis_from_x_and_old_nearaxis(new_field_nearaxis_x, field_nearaxis):
2222
nphi=field_nearaxis.nphi, spsi=field_nearaxis.spsi, sG=field_nearaxis.sG, nfp=field_nearaxis.nfp)
2323
return new_field_nearaxis
2424

25-
def optimize_loss_function(func, initial_dofs, coils, tolerance_optimization=1e-4, maximum_function_evaluations=30, **kwargs):
25+
def optimize_loss_function(func, initial_dofs, coils, tolerance_optimization=1e-4, maximum_function_evaluations=30, method='L-BFGS-B', **kwargs):
2626
len_dofs_curves = len(jnp.ravel(coils.dofs_curves))
2727
nfp = coils.nfp
2828
stellsym = coils.stellsym
@@ -42,7 +42,7 @@ def optimize_loss_function(func, initial_dofs, coils, tolerance_optimization=1e-
4242
# result = least_squares(loss_partial, x0=initial_dofs, verbose=2, jac=jac_loss_partial,
4343
# ftol=tolerance_optimization, gtol=tolerance_optimization,
4444
# xtol=1e-14, max_nfev=maximum_function_evaluations)
45-
result = minimize(loss_partial, x0=initial_dofs, jac=jac_loss_partial, method='L-BFGS-B',
45+
result = minimize(loss_partial, x0=initial_dofs, jac=jac_loss_partial, method=method,
4646
tol=tolerance_optimization, options={'maxiter': maximum_function_evaluations, 'disp': True, 'gtol': 1e-14, 'ftol': 1e-14})
4747

4848
dofs_curves = jnp.reshape(result.x[:len_dofs_curves], (dofs_curves_shape))

0 commit comments

Comments
 (0)