Skip to content

Commit 0569178

Browse files
murbardfmfn
authored andcommitted
fix typo, OPTMIZATION -> OPTIMIZATION
1 parent 95bd3cd commit 0569178

File tree

9 files changed

+39
-39
lines changed

9 files changed

+39
-39
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ The `BayesianOptimization` object fires a number of internal events during optim
235235

236236
```python
237237
logger = JSONLogger(path="./logs.json")
238-
optimizer.subscribe(Events.OPTMIZATION_STEP, logger)
238+
optimizer.subscribe(Events.OPTIMIZATION_STEP, logger)
239239

240240
# Results will be saved in ./logs.json
241241
optimizer.maximize(

bayes_opt/bayesian_optimization.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ def res(self):
102102
def register(self, params, target):
103103
"""Expect observation with known target"""
104104
self._space.register(params, target)
105-
self.dispatch(Events.OPTMIZATION_STEP)
105+
self.dispatch(Events.OPTIMIZATION_STEP)
106106

107107
def probe(self, params, lazy=True):
108108
"""Probe target of x"""
109109
if lazy:
110110
self._queue.add(params)
111111
else:
112112
self._space.probe(params)
113-
self.dispatch(Events.OPTMIZATION_STEP)
113+
self.dispatch(Events.OPTIMIZATION_STEP)
114114

115115
def suggest(self, utility_function):
116116
"""Most promissing point to probe next"""
@@ -145,9 +145,9 @@ def _prime_queue(self, init_points):
145145
def _prime_subscriptions(self):
146146
if not any([len(subs) for subs in self._events.values()]):
147147
_logger = _get_default_logger(self._verbose)
148-
self.subscribe(Events.OPTMIZATION_START, _logger)
149-
self.subscribe(Events.OPTMIZATION_STEP, _logger)
150-
self.subscribe(Events.OPTMIZATION_END, _logger)
148+
self.subscribe(Events.OPTIMIZATION_START, _logger)
149+
self.subscribe(Events.OPTIMIZATION_STEP, _logger)
150+
self.subscribe(Events.OPTIMIZATION_END, _logger)
151151

152152
def maximize(self,
153153
init_points=5,
@@ -158,7 +158,7 @@ def maximize(self,
158158
**gp_params):
159159
"""Mazimize your function"""
160160
self._prime_subscriptions()
161-
self.dispatch(Events.OPTMIZATION_START)
161+
self.dispatch(Events.OPTIMIZATION_START)
162162
self._prime_queue(init_points)
163163
self.set_gp_params(**gp_params)
164164

@@ -173,7 +173,7 @@ def maximize(self,
173173

174174
self.probe(x_probe, lazy=False)
175175

176-
self.dispatch(Events.OPTMIZATION_END)
176+
self.dispatch(Events.OPTIMIZATION_END)
177177

178178
def set_bounds(self, new_bounds):
179179
"""

bayes_opt/event.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
class Events:
2-
OPTMIZATION_START = 'optmization:start'
3-
OPTMIZATION_STEP = 'optmization:step'
4-
OPTMIZATION_END = 'optmization:end'
2+
OPTIMIZATION_START = 'optimization:start'
3+
OPTIMIZATION_STEP = 'optimization:step'
4+
OPTIMIZATION_END = 'optimization:end'
55

66

77
DEFAULT_EVENTS = [
8-
Events.OPTMIZATION_START,
9-
Events.OPTMIZATION_STEP,
10-
Events.OPTMIZATION_END,
8+
Events.OPTIMIZATION_START,
9+
Events.OPTIMIZATION_STEP,
10+
Events.OPTIMIZATION_END,
1111
]

bayes_opt/logger.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,16 @@ def _is_new_max(self, instance):
8686
return instance.max["target"] > self._previous_max
8787

8888
def update(self, event, instance):
89-
if event == Events.OPTMIZATION_START:
89+
if event == Events.OPTIMIZATION_START:
9090
line = self._header(instance) + "\n"
91-
elif event == Events.OPTMIZATION_STEP:
91+
elif event == Events.OPTIMIZATION_STEP:
9292
is_new_max = self._is_new_max(instance)
9393
if self._verbose == 1 and not is_new_max:
9494
line = ""
9595
else:
9696
colour = Colours.purple if is_new_max else Colours.black
9797
line = self._step(instance, colour=colour) + "\n"
98-
elif event == Events.OPTMIZATION_END:
98+
elif event == Events.OPTIMIZATION_END:
9999
line = "=" * self._header_length + "\n"
100100

101101
if self._verbose:
@@ -113,7 +113,7 @@ def __init__(self, path):
113113
super(JSONLogger, self).__init__()
114114

115115
def update(self, event, instance):
116-
if event == Events.OPTMIZATION_STEP:
116+
if event == Events.OPTIMIZATION_STEP:
117117
data = dict(instance.res[-1])
118118

119119
now, time_elapsed, time_delta = self._time_metrics()

bayes_opt/observer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def __init__(self):
2121
self._previous_time = None
2222

2323
def _update_tracker(self, event, instance):
24-
if event == Events.OPTMIZATION_STEP:
24+
if event == Events.OPTIMIZATION_STEP:
2525
self._iterations += 1
2626

2727
current_max = instance.max

examples/advanced-tour.ipynb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@
427427
"my_observer = BasicObserver()\n",
428428
"\n",
429429
"optimizer.subscribe(\n",
430-
" event=Events.OPTMIZATION_STEP,\n",
430+
" event=Events.OPTIMIZATION_STEP,\n",
431431
" subscriber=my_observer,\n",
432432
" callback=None, # Will use the `update` method as callback\n",
433433
")"
@@ -450,7 +450,7 @@
450450
" print(\"Go nuts here!\")\n",
451451
"\n",
452452
"optimizer.subscribe(\n",
453-
" event=Events.OPTMIZATION_START,\n",
453+
" event=Events.OPTIMIZATION_START,\n",
454454
" subscriber=\"Any hashable object\",\n",
455455
" callback=my_callback,\n",
456456
")"
@@ -466,9 +466,9 @@
466466
"output_type": "stream",
467467
"text": [
468468
"Go nuts here!\n",
469-
"Event `optmization:step` was observed\n",
470-
"Event `optmization:step` was observed\n",
471-
"Event `optmization:step` was observed\n"
469+
"Event `optimization:step` was observed\n",
470+
"Event `optimization:step` was observed\n",
471+
"Event `optimization:step` was observed\n"
472472
]
473473
}
474474
],
@@ -491,7 +491,7 @@
491491
{
492492
"data": {
493493
"text/plain": [
494-
"['optmization:start', 'optmization:step', 'optmization:end']"
494+
"['optimization:start', 'optimization:step', 'optimization:end']"
495495
]
496496
},
497497
"execution_count": 20,

examples/basic-tour.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,7 @@
346346
"outputs": [],
347347
"source": [
348348
"logger = JSONLogger(path=\"./logs.json\")\n",
349-
"optimizer.subscribe(Events.OPTMIZATION_STEP, logger)"
349+
"optimizer.subscribe(Events.OPTIMIZATION_STEP, logger)"
350350
]
351351
},
352352
{

tests/test_bayesian_optimization.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -162,33 +162,33 @@ def test_callback(event, instance):
162162

163163
optimizer = BayesianOptimization(target_func, PBOUNDS, random_state=1)
164164
optimizer.subscribe(
165-
event=Events.OPTMIZATION_START,
165+
event=Events.OPTIMIZATION_START,
166166
subscriber=test_subscriber,
167167
callback=test_callback,
168168
)
169169
# Test that the desired observer is subscribed
170170
assert all([
171171
k == test_subscriber for k in
172-
optimizer._events[Events.OPTMIZATION_START].keys()
172+
optimizer._events[Events.OPTIMIZATION_START].keys()
173173
])
174174
assert all([
175175
v == test_callback for v in
176-
optimizer._events[Events.OPTMIZATION_START].values()
176+
optimizer._events[Events.OPTIMIZATION_START].values()
177177
])
178178

179179
# Check that prime subscriptions won't overight manual subscriptions
180180
optimizer._prime_subscriptions()
181181
assert all([
182182
k == test_subscriber for k in
183-
optimizer._events[Events.OPTMIZATION_START].keys()
183+
optimizer._events[Events.OPTIMIZATION_START].keys()
184184
])
185185
assert all([
186186
v == test_callback for v in
187-
optimizer._events[Events.OPTMIZATION_START].values()
187+
optimizer._events[Events.OPTIMIZATION_START].values()
188188
])
189189

190-
assert optimizer._events[Events.OPTMIZATION_STEP] == {}
191-
assert optimizer._events[Events.OPTMIZATION_END] == {}
190+
assert optimizer._events[Events.OPTIMIZATION_STEP] == {}
191+
assert optimizer._events[Events.OPTIMIZATION_END] == {}
192192

193193
with pytest.raises(KeyError):
194194
optimizer._events["other"]
@@ -253,17 +253,17 @@ def reset(self):
253253

254254
tracker = Tracker()
255255
optimizer.subscribe(
256-
event=Events.OPTMIZATION_START,
256+
event=Events.OPTIMIZATION_START,
257257
subscriber=tracker,
258258
callback=tracker.update_start,
259259
)
260260
optimizer.subscribe(
261-
event=Events.OPTMIZATION_STEP,
261+
event=Events.OPTIMIZATION_STEP,
262262
subscriber=tracker,
263263
callback=tracker.update_step,
264264
)
265265
optimizer.subscribe(
266-
event=Events.OPTMIZATION_END,
266+
event=Events.OPTIMIZATION_END,
267267
subscriber=tracker,
268268
callback=tracker.update_end,
269269
)

tests/test_observer.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,19 +86,19 @@ def max(self):
8686
assert tracker._previous_max is None
8787
assert tracker._previous_max_params is None
8888

89-
tracker._update_tracker(Events.OPTMIZATION_STEP, test_instance)
89+
tracker._update_tracker(Events.OPTIMIZATION_STEP, test_instance)
9090
assert tracker._iterations == 1
9191
assert tracker._previous_max == 1
9292
assert tracker._previous_max_params == [1, 1]
9393

9494
new_instance = MockInstance(max_target=7, max_params=[7, 7])
95-
tracker._update_tracker(Events.OPTMIZATION_STEP, new_instance)
95+
tracker._update_tracker(Events.OPTIMIZATION_STEP, new_instance)
9696
assert tracker._iterations == 2
9797
assert tracker._previous_max == 7
9898
assert tracker._previous_max_params == [7, 7]
9999

100100
other_instance = MockInstance(max_target=2, max_params=[2, 2])
101-
tracker._update_tracker(Events.OPTMIZATION_STEP, other_instance)
101+
tracker._update_tracker(Events.OPTIMIZATION_STEP, other_instance)
102102
assert tracker._iterations == 3
103103
assert tracker._previous_max == 7
104104
assert tracker._previous_max_params == [7, 7]

0 commit comments

Comments
 (0)