Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix min window type check #523

Merged
merged 4 commits into from
Oct 1, 2024
Merged

Fix min window type check #523

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7808b0
fix: replace dict with Mapping
phi-friday Sep 20, 2024
c0d2adf
fix: replace list with Sequence
phi-friday Sep 20, 2024
3ba5e61
fix: add type hint
phi-friday Sep 20, 2024
094c2ac
fix: does not accept None
phi-friday Oct 1, 2024
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
12 changes: 7 additions & 5 deletions bayes_opt/domain_reduction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
from __future__ import annotations

from abc import ABC, abstractmethod
from collections.abc import Iterable, Mapping, Sequence
from typing import TYPE_CHECKING, Any
from warnings import warn

Expand All @@ -16,8 +17,6 @@
from bayes_opt.target_space import TargetSpace

if TYPE_CHECKING:
from collections.abc import Iterable, Mapping, Sequence

from numpy.typing import NDArray

Float = np.floating[Any]
Expand Down Expand Up @@ -66,12 +65,14 @@ def __init__(
gamma_osc: float = 0.7,
gamma_pan: float = 1.0,
eta: float = 0.9,
minimum_window: NDArray[Float] | Sequence[float] | float | Mapping[str, float] | None = 0.0,
minimum_window: NDArray[Float] | Sequence[float] | Mapping[str, float] | float = 0.0,
) -> None:
self.gamma_osc = gamma_osc
self.gamma_pan = gamma_pan
self.eta = eta
if isinstance(minimum_window, dict):

self.minimum_window_value: NDArray[Float] | Sequence[float] | float
if isinstance(minimum_window, Mapping):
self.minimum_window_value = [
item[1] for item in sorted(minimum_window.items(), key=lambda x: x[0])
]
Expand All @@ -90,8 +91,9 @@ def initialize(self, target_space: TargetSpace) -> None:
self.original_bounds = np.copy(target_space.bounds)
self.bounds = [self.original_bounds]

self.minimum_window: NDArray[Float] | Sequence[float]
# Set the minimum window to an array of length bounds
if isinstance(self.minimum_window_value, (list, np.ndarray)):
if isinstance(self.minimum_window_value, (Sequence, np.ndarray)):
if len(self.minimum_window_value) != len(target_space.bounds):
error_msg = "Length of minimum_window must be the same as the number of parameters"
raise ValueError(error_msg)
Expand Down
Loading