Skip to content

Commit

Permalink
Fixed broken alm.py
Browse files Browse the repository at this point in the history
  • Loading branch information
ttadano committed Sep 10, 2022
1 parent 8e97eaf commit 2e39f68
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions python/alm/alm.py
Original file line number Diff line number Diff line change
Expand Up @@ -479,24 +479,25 @@ def optimizer_control(self, optcontrol):
if self._id is None:
self._show_error_not_initizalied()

keys = optimizer_control_data_types.keys()
supported_keys = optimizer_control_data_types.keys()
optctrl = []
optcontrol_l = {key.lower(): optcontrol[key] for key in optcontrol}

for i, key in enumerate(optcontrol):
if key.lower() not in keys:
if key.lower() not in supported_keys:
msg = "%s is not a valide key for optimizer control." % key
raise KeyError(msg)

for i, key in enumerate(keys):
for i, key in enumerate(supported_keys):
if key in optcontrol_l:
optctrl.append(optcontrol_l[key])
else:
optctrl.append(None)

self._set_optimizer_control(optctrl)
alm.set_optimizer_control(self._id, optctrl)


def _set_optimizer_control(self, optcontrol):
def set_optimizer_control(self, optcontrol):
self.optimizer_control = optcontrol

@property
Expand Down Expand Up @@ -1039,16 +1040,12 @@ def save_fc(self, filename, format="alamode", maxorder_to_save=3):
else:
raise ValueError("Invalid format in save_fc.")

@property
def cv_l1_alpha(self):
def get_cv_l1_alpha(self):
"""Return L1 alpha at minimum CV."""
if self._id is None:
self._show_error_not_initizalied()

return self._get_cv_l1_alpha()

def _get_cv_l1_alpha(self):
return self.cv_l1_alpha
return alm.get_cv_l1_alpha(self._id)

def _transfer_parameters(self):
if self._need_transfer:
Expand Down

0 comments on commit 2e39f68

Please sign in to comment.