Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/popt/loop/optimize.py
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ def run_loop(self):
previous_state = self.xk
self.epf['r'] *= self.epf['r_factor'] # increase penalty factor
self.obj_func_tol *= self.epf['tol_factor'] # decrease tolerance
self.obj_func_values = self.fun(self.xk, **self.epf)
self.obj_func_values = self.fun(self.xk, epf=self.epf)
self.iteration = 0
self.epf_iteration += 1
optimize_result = ot.get_optimize_result(self)
Expand Down
4 changes: 3 additions & 1 deletion src/popt/update_schemes/enopt.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ def __set__variable(var_name=None, defalut=None):

# Set other optimization parameters
self.obj_func_tol = __set__variable('tol', 1e-6)
self.alpha = __set__variable('alpha', 0.1)
self.alpha = __set__variable('step_size', 0.1)
self.alpha = __set__variable('alpha', 0.1) # accept either 'step_size' or 'alpha' for step size,
# with 'alpha' as the default
self.alpha_cov = __set__variable('alpha_cov', 0.001)
self.beta = __set__variable('beta', 0.0) # this is stored in the optimizer class
self.nesterov = __set__variable('nesterov', False) # use Nesterov acceleration if value is true
Expand Down
Loading