Skip to content

Add Branin and Hartmann to public import #1068

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

Merged
merged 1 commit into from
Mar 13, 2024
Merged

Add Branin and Hartmann to public import #1068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion vizier/_src/benchmarks/experimenters/synthetic/branin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ def _branin(x: np.ndarray) -> float:
return y


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

def __init__(self):
Expand Down
6 changes: 3 additions & 3 deletions vizier/_src/benchmarks/experimenters/synthetic/branin_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from absl.testing import absltest


class BraninTest(absltest.TestCase):
class Branin2DExperimenterTest(absltest.TestCase):

def test_branin_impl(self):
np.testing.assert_allclose(
Expand All @@ -35,7 +35,7 @@ def test_branin_impl(self):

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

def test_experimenter(self):
experimenter_testing.assert_evaluates_random_suggestions(
self, branin.Branin2D()
self, branin.Branin2DExperimenter()
)


Expand Down
4 changes: 2 additions & 2 deletions vizier/_src/benchmarks/experimenters/synthetic/hartmann.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def _hartmann6d(x: np.ndarray) -> float:
return y


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

def __init__(self):
Expand Down Expand Up @@ -100,7 +100,7 @@ def _hartmann3d(x: np.ndarray) -> float:
return y


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

def __init__(self):
Expand Down
12 changes: 6 additions & 6 deletions vizier/_src/benchmarks/experimenters/synthetic/hartmann_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
from absl.testing import absltest


class Hartmann6DTest(absltest.TestCase):
class Hartmann6DExperimenterTest(absltest.TestCase):

def test_numpy_fn(self):
np.testing.assert_allclose(
Expand All @@ -45,7 +45,7 @@ def test_experimenter_argmin(self):
)
}
)
hartmann.Hartmann6D().evaluate([trial])
hartmann.Hartmann6DExperimenter().evaluate([trial])
self.assertAlmostEqual(
trial.final_measurement_or_die.metrics.get_value('value', np.nan),
-3.32237,
Expand All @@ -54,11 +54,11 @@ def test_experimenter_argmin(self):

def test_experimenter(self):
experimenter_testing.assert_evaluates_random_suggestions(
self, hartmann.Hartmann6D()
self, hartmann.Hartmann6DExperimenter()
)


class Hartmann3DTest(absltest.TestCase):
class Hartmann3DExperimenterTest(absltest.TestCase):

def test_numpy_fn(self):
np.testing.assert_allclose(
Expand All @@ -73,7 +73,7 @@ def test_experimenter_argmin(self):
f'x{i+1}': x for i, x in enumerate([0.114614, 0.555649, 0.852547])
}
)
hartmann.Hartmann3D().evaluate([trial])
hartmann.Hartmann3DExperimenter().evaluate([trial])
self.assertAlmostEqual(
trial.final_measurement_or_die.metrics.get_value('value', np.nan),
-3.86278,
Expand All @@ -82,7 +82,7 @@ def test_experimenter_argmin(self):

def test_experimenter(self):
experimenter_testing.assert_evaluates_random_suggestions(
self, hartmann.Hartmann3D()
self, hartmann.Hartmann3DExperimenter()
)


Expand Down
3 changes: 3 additions & 0 deletions vizier/benchmarks/experimenters/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@
from vizier._src.benchmarks.experimenters.surrogate_experimenter import PredictorExperimenter
from vizier._src.benchmarks.experimenters.switch_experimenter import SwitchExperimenter
from vizier._src.benchmarks.experimenters.synthetic import bbob
from vizier._src.benchmarks.experimenters.synthetic.branin import Branin2DExperimenter
from vizier._src.benchmarks.experimenters.synthetic.hartmann import Hartmann3DExperimenter
from vizier._src.benchmarks.experimenters.synthetic.hartmann import Hartmann6DExperimenter