Skip to content

Commit 91a1d4d

Browse files
author
Thomas Morris
committed
even more tests
1 parent 5060217 commit 91a1d4d

3 files changed

Lines changed: 17 additions & 7 deletions

File tree

.codecov.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ coverage:
77
target: auto
88
patch:
99
default:
10-
target: auto
10+
target: 80

src/blop/generation/__init__.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
from ax.generation_strategy.generation_strategy import GenerationStrategy
2-
3-
from .nodes import latent_gp_node, sobol_node
1+
from .beamline import beamline_generation_strategy
42

53
all_strategies = ["beamline"]
64

75

6+
class InvalidStrategyError(Exception): ...
7+
8+
89
def get_generation_strategy(name):
910

1011
if name not in all_strategies:
11-
raise ValueError(f"Invalid strategy '{name}', valid strategies are one of {all_strategies}")
12+
raise InvalidStrategyError(f"Invalid strategy '{name}', valid strategies are one of {all_strategies}")
1213

1314
if name == "beamline":
14-
return GenerationStrategy(name="Custom Generation Strategy", nodes=[sobol_node, latent_gp_node])
15+
return beamline_generation_strategy

src/blop/tests/ax/test_generation.py renamed to src/blop/tests/generation/test_generation.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from blop.ax.dof import RangeDOF
1212
from blop.ax.objective import Objective
1313
from blop.evaluation.test_functions import TestFunctionEvaluation
14-
from blop.generation import all_strategies, get_generation_strategy
14+
from blop.generation import InvalidStrategyError, all_strategies, get_generation_strategy
1515

1616
from ..conftest import MovableSignal
1717
from ..test_plans import _collect_optimize_events
@@ -27,6 +27,15 @@ def test_get_generation_strategy(name):
2727
get_generation_strategy(name)
2828

2929

30+
def test_invalid_strategy():
31+
try:
32+
get_generation_strategy("invalid_strategy")
33+
except InvalidStrategyError:
34+
pass
35+
except Exception as error:
36+
raise error
37+
38+
3039
def test_optimize(RE):
3140

3241
dofs = [

0 commit comments

Comments
 (0)