Skip to content

Commit

Permalink
Remove _waiting_for_enqueue_list function.
Browse files Browse the repository at this point in the history
  • Loading branch information
KanaiYuma-aist committed Apr 1, 2024
1 parent ba81d2f commit b4caa27
Showing 1 changed file with 11 additions and 14 deletions.
25 changes: 11 additions & 14 deletions aiaccel/hpo/samplers/nelder_mead_sampler.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,29 +88,26 @@ def _waiting_for_float(self) -> Generator[None, None, tuple[float, list[float]]]
result, enqueue_values = yield from self._waiting_for_list(1)
return result[0], enqueue_values

def _waiting_for_enqueue_list(self, num_waiting: int | None = None) -> Generator[None, None, list[float]]:
num_waiting = num_waiting if num_waiting is not None else self.num_enqueued
results: list[float] = []
while len(results) < num_waiting:
def _waiting_for_list(self, num_waiting: int) -> Generator[None, None, tuple[list[float], list[float]]]:
# values of nelder mead vertices
values: list[float] = []
while len(values) < num_waiting:
try:
results.append(self.get_enqueue_value_queue(self.block, self.timeout))
values.append(self.get_value_queue(self.block, self.timeout))
except queue.Empty:
yield None

self.num_enqueued -= num_waiting
return results

def _waiting_for_list(self, num_waiting: int) -> Generator[None, None, tuple[list[float], list[float]]]:
results: list[float] = []
while len(results) < num_waiting:
# values of enqueue vertices
enqueue_values: list[float] = []
while len(enqueue_values) < self.num_enqueued:
try:
results.append(self.get_value_queue(self.block, self.timeout))
enqueue_values.append(self.get_enqueue_value_queue(self.block, self.timeout))
except queue.Empty:
yield None

enqueue_values = yield from self._waiting_for_enqueue_list()
self.num_enqueued = 0

return results, enqueue_values
return values, enqueue_values

def _initialization(self) -> Generator[np.ndarray, None, None]:
dimension = len(self._search_space)
Expand Down

0 comments on commit b4caa27

Please sign in to comment.