Skip to content

Commit e26f973

Browse files
Balandatfacebook-github-bot
authored andcommitted
Test function refactor (#273)
Summary: Pull Request resolved: #273 Moves the test function refactor into OSS and consolidates the augmented funtions for multi-fidelity optimization. Still needs some cleaning up, full test coverage, and some work on docstrings. I considered making this change in a backward-compatible fashion, but I don't think it's worth the work and the code bloat. Reviewed By: danielrjiang Differential Revision: D17501790 fbshipit-source-id: b6cfac9ae27089da6b73c93f161f3ed9ff12785e
1 parent 29df14c commit e26f973

34 files changed

+1097
-1184
lines changed

botorch/test_functions/__init__.py

Lines changed: 48 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,55 @@
22

33
# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
44

5-
from .aug_branin import neg_aug_branin
6-
from .aug_hartmann6 import neg_aug_hartmann6
7-
from .aug_rosenbrock import neg_aug_rosenbrock
8-
from .branin import neg_branin
9-
from .eggholder import neg_eggholder
10-
from .hartmann6 import neg_hartmann6
11-
from .holder_table import neg_holder_table
12-
from .michalewicz import neg_michalewicz
13-
from .styblinski_tang import neg_styblinski_tang
5+
from .multi_fidelity import AugmentedBranin, AugmentedHartmann, AugmentedRosenbrock
6+
from .synthetic import (
7+
Ackley,
8+
Beale,
9+
Branin,
10+
Bukin,
11+
Cosine8,
12+
DixonPrice,
13+
DropWave,
14+
EggHolder,
15+
Griewank,
16+
Hartmann,
17+
HolderTable,
18+
Levy,
19+
Michalewicz,
20+
Powell,
21+
Rastrigin,
22+
Rosenbrock,
23+
Shekel,
24+
SixHumpCamel,
25+
StyblinskiTang,
26+
SyntheticTestFunction,
27+
ThreeHumpCamel,
28+
)
1429

1530

1631
__all__ = [
17-
"neg_branin",
18-
"neg_eggholder",
19-
"neg_hartmann6",
20-
"neg_holder_table",
21-
"neg_michalewicz",
22-
"neg_styblinski_tang",
23-
"neg_aug_branin",
24-
"neg_aug_hartmann6",
25-
"neg_aug_rosenbrock",
32+
"Ackley",
33+
"AugmentedBranin",
34+
"AugmentedHartmann",
35+
"AugmentedRosenbrock",
36+
"Beale",
37+
"Branin",
38+
"Bukin",
39+
"Cosine8",
40+
"DixonPrice",
41+
"DropWave",
42+
"EggHolder",
43+
"Griewank",
44+
"Hartmann",
45+
"HolderTable",
46+
"Levy",
47+
"Michalewicz",
48+
"Powell",
49+
"Rastrigin",
50+
"Rosenbrock",
51+
"Shekel",
52+
"SixHumpCamel",
53+
"StyblinskiTang",
54+
"SyntheticTestFunction",
55+
"ThreeHumpCamel",
2656
]

botorch/test_functions/ackley.py

Lines changed: 0 additions & 47 deletions
This file was deleted.

botorch/test_functions/aug_branin.py

Lines changed: 0 additions & 47 deletions
This file was deleted.

botorch/test_functions/aug_hartmann6.py

Lines changed: 0 additions & 45 deletions
This file was deleted.

botorch/test_functions/aug_rosenbrock.py

Lines changed: 0 additions & 43 deletions
This file was deleted.

botorch/test_functions/branin.py

Lines changed: 0 additions & 42 deletions
This file was deleted.

botorch/test_functions/cosine8.py

Lines changed: 0 additions & 37 deletions
This file was deleted.

botorch/test_functions/eggholder.py

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)