Skip to content

Commit a5c47bc

Browse files
committed
Adjust Michalewicz benchmark
1 parent e958863 commit a5c47bc

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

.github/workflows/manual_benchmark.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ on:
5252
required: false
5353
default: false
5454
type: boolean
55-
michalewicz_tl_noise:
56-
description: "michalewicz_tl_noise_benchmark"
55+
michalewicz_tl_continuous:
56+
description: "michalewicz_tl_continuous_benchmark"
5757
required: false
5858
default: false
5959
type: boolean

benchmarks/domains/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
hartmann_tl_3_30_negate_15_benchmark,
2525
)
2626
from benchmarks.domains.transfer_learning.michalewicz.michalewicz_tl_continuous import (
27-
michalewicz_tl_noise_benchmark,
27+
michalewicz_tl_continuous_benchmark,
2828
)
2929

3030
BENCHMARKS: list[Benchmark] = [
@@ -36,7 +36,7 @@
3636
easom_tl_100_negate_noise5_benchmark,
3737
hartmann_tl_3_30_negate_15_benchmark,
3838
hartmann_tl_3_20_15_benchmark,
39-
michalewicz_tl_noise_benchmark,
39+
michalewicz_tl_continuous_benchmark,
4040
]
4141

4242

benchmarks/domains/transfer_learning/michalewicz/michalewicz_tl_continuous.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
from baybe.campaign import Campaign
1818
from baybe.objectives import SingleTargetObjective
1919
from baybe.parameters import NumericalContinuousParameter, TaskParameter
20+
from baybe.parameters.base import Parameter
2021
from baybe.searchspace import SearchSpace
2122
from baybe.simulation import simulate_scenarios
2223
from baybe.targets import NumericalTarget
@@ -25,7 +26,7 @@
2526

2627
def create_searchspace(use_task_parameter: bool) -> SearchSpace:
2728
"""Create search space for the benchmark."""
28-
params = [
29+
params: list[Parameter] = [
2930
NumericalContinuousParameter(
3031
name=f"x{k}",
3132
bounds=(0, math.pi),
@@ -100,7 +101,7 @@ def create_initial_data(
100101
return df
101102

102103

103-
def michalewicz_tl_noise(settings: ConvergenceBenchmarkSettings) -> pd.DataFrame:
104+
def michalewicz_tl_continuous(settings: ConvergenceBenchmarkSettings) -> pd.DataFrame:
104105
"""Benchmark function comparing TL and non-TL campaigns.
105106
106107
Inputs:
@@ -130,7 +131,7 @@ def michalewicz_tl_noise(settings: ConvergenceBenchmarkSettings) -> pd.DataFrame
130131
for p in [1, 10, 25, 50, 100]:
131132
results.append(
132133
simulate_scenarios(
133-
{f"{p}": campaign_tl},
134+
{f"{p}": campaign_tl, f"{p}_naive": campaign_nontl},
134135
lambda x: wrap_function(
135136
functions["Target_Function"], "Target_Function", x
136137
),
@@ -163,8 +164,8 @@ def michalewicz_tl_noise(settings: ConvergenceBenchmarkSettings) -> pd.DataFrame
163164
n_mc_iterations=30,
164165
)
165166

166-
michalewicz_tl_noise_benchmark = ConvergenceBenchmark(
167-
function=michalewicz_tl_noise,
167+
michalewicz_tl_continuous_benchmark = ConvergenceBenchmark(
168+
function=michalewicz_tl_continuous,
168169
optimal_target_values={"Target": 4.687658},
169170
settings=benchmark_config,
170171
)

0 commit comments

Comments
 (0)