Skip to content

Commit 3295513

Browse files
xingyousongcopybara-github
authored andcommitted
Add Branin and Hartmann to public import
PiperOrigin-RevId: 615269720
1 parent 8c9a030 commit 3295513

File tree

5 files changed

+15
-12
lines changed

5 files changed

+15
-12
lines changed

vizier/_src/benchmarks/experimenters/synthetic/branin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def _branin(x: np.ndarray) -> float:
4848
return y
4949

5050

51-
class Branin2D(experimenter.Experimenter):
51+
class Branin2DExperimenter(experimenter.Experimenter):
5252
"""2D minimization function. See https://www.sfu.ca/~ssurjano/branin.html."""
5353

5454
def __init__(self):

vizier/_src/benchmarks/experimenters/synthetic/branin_test.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from absl.testing import absltest
2323

2424

25-
class BraninTest(absltest.TestCase):
25+
class Branin2DExperimenterTest(absltest.TestCase):
2626

2727
def test_branin_impl(self):
2828
np.testing.assert_allclose(
@@ -35,7 +35,7 @@ def test_branin_impl(self):
3535

3636
def test_experimenter_argmin(self):
3737
trial = vz.Trial(parameters={'x1': -np.pi, 'x2': 12.275})
38-
branin.Branin2D().evaluate([trial])
38+
branin.Branin2DExperimenter().evaluate([trial])
3939
self.assertAlmostEqual(
4040
trial.final_measurement_or_die.metrics.get_value('value', np.nan),
4141
0.397887,
@@ -44,7 +44,7 @@ def test_experimenter_argmin(self):
4444

4545
def test_experimenter(self):
4646
experimenter_testing.assert_evaluates_random_suggestions(
47-
self, branin.Branin2D()
47+
self, branin.Branin2DExperimenter()
4848
)
4949

5050

vizier/_src/benchmarks/experimenters/synthetic/hartmann.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ def _hartmann6d(x: np.ndarray) -> float:
5151
return y
5252

5353

54-
class Hartmann6D(experimenter.Experimenter):
54+
class Hartmann6DExperimenter(experimenter.Experimenter):
5555
"""6D minimization function. See https://www.sfu.ca/~ssurjano/hart6.html."""
5656

5757
def __init__(self):
@@ -100,7 +100,7 @@ def _hartmann3d(x: np.ndarray) -> float:
100100
return y
101101

102102

103-
class Hartmann3D(experimenter.Experimenter):
103+
class Hartmann3DExperimenter(experimenter.Experimenter):
104104
"""3D minimization function. See https://www.sfu.ca/~ssurjano/hart3.html."""
105105

106106
def __init__(self):

vizier/_src/benchmarks/experimenters/synthetic/hartmann_test.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from absl.testing import absltest
2424

2525

26-
class Hartmann6DTest(absltest.TestCase):
26+
class Hartmann6DExperimenterTest(absltest.TestCase):
2727

2828
def test_numpy_fn(self):
2929
np.testing.assert_allclose(
@@ -45,7 +45,7 @@ def test_experimenter_argmin(self):
4545
)
4646
}
4747
)
48-
hartmann.Hartmann6D().evaluate([trial])
48+
hartmann.Hartmann6DExperimenter().evaluate([trial])
4949
self.assertAlmostEqual(
5050
trial.final_measurement_or_die.metrics.get_value('value', np.nan),
5151
-3.32237,
@@ -54,11 +54,11 @@ def test_experimenter_argmin(self):
5454

5555
def test_experimenter(self):
5656
experimenter_testing.assert_evaluates_random_suggestions(
57-
self, hartmann.Hartmann6D()
57+
self, hartmann.Hartmann6DExperimenter()
5858
)
5959

6060

61-
class Hartmann3DTest(absltest.TestCase):
61+
class Hartmann3DExperimenterTest(absltest.TestCase):
6262

6363
def test_numpy_fn(self):
6464
np.testing.assert_allclose(
@@ -73,7 +73,7 @@ def test_experimenter_argmin(self):
7373
f'x{i+1}': x for i, x in enumerate([0.114614, 0.555649, 0.852547])
7474
}
7575
)
76-
hartmann.Hartmann3D().evaluate([trial])
76+
hartmann.Hartmann3DExperimenter().evaluate([trial])
7777
self.assertAlmostEqual(
7878
trial.final_measurement_or_die.metrics.get_value('value', np.nan),
7979
-3.86278,
@@ -82,7 +82,7 @@ def test_experimenter_argmin(self):
8282

8383
def test_experimenter(self):
8484
experimenter_testing.assert_evaluates_random_suggestions(
85-
self, hartmann.Hartmann3D()
85+
self, hartmann.Hartmann3DExperimenter()
8686
)
8787

8888

vizier/benchmarks/experimenters/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,6 @@
3939
from vizier._src.benchmarks.experimenters.surrogate_experimenter import PredictorExperimenter
4040
from vizier._src.benchmarks.experimenters.switch_experimenter import SwitchExperimenter
4141
from vizier._src.benchmarks.experimenters.synthetic import bbob
42+
from vizier._src.benchmarks.experimenters.synthetic.branin import Branin2DExperimenter
43+
from vizier._src.benchmarks.experimenters.synthetic.hartmann import Hartmann3DExperimenter
44+
from vizier._src.benchmarks.experimenters.synthetic.hartmann import Hartmann6DExperimenter

0 commit comments

Comments
 (0)