Skip to content
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

add fixtures to parameterization #1210

Closed
wants to merge 7 commits into from
Closed

add fixtures to parameterization #1210

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0812b64
add fixtures to parameterization
kianorr Aug 20, 2024
8ed8f64
Merge branch 'master' into ko/param-coil-test
dpanici Aug 27, 2024
ccaddfb
add nested coil set and spline coil
kianorr Aug 29, 2024
33b6d56
add nested coils and remove saving
kianorr Aug 29, 2024
dcea61f
add None as arg
kianorr Aug 29, 2024
0ab468e
Merge branch 'ko/param-coil-test' of https://github.com/PlasmaControl…
kianorr Aug 29, 2024
14d5159
increase maxiter for nested coilset
kianorr Aug 29, 2024
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
44 changes: 17 additions & 27 deletions tests/test_examples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1314,16 +1314,22 @@ def test_second_stage_optimization_CoilSet():

@pytest.mark.slow
@pytest.mark.unit
def test_optimize_with_all_coil_types(DummyCoilSet, DummyMixedCoilSet):
@pytest.mark.parametrize(
"coil,optimizer,path",
[
(FourierPlanarCoil(), "fmintr", ""),
(FourierRZCoil(), "fmintr", ""),
(FourierXYZCoil(), "fmintr", ""),
("DummyCoilSet", "lsq-exact", "output_path_sym"),
("DummyCoilSet", "lsq-exact", "output_path_asym"),
("DummyMixedCoilSet", "lsq-exact", "output_path"),
],
)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

make the coilsets as conftest fixtures

def test_optimize_with_all_coil_types(coil, optimizer, path, request):
"""Test optimizing for every type of coil and dummy coil sets."""
sym_coils = load(load_from=str(DummyCoilSet["output_path_sym"]), file_format="hdf5")
asym_coils = load(
load_from=str(DummyCoilSet["output_path_asym"]), file_format="hdf5"
)
mixed_coils = load(
load_from=str(DummyMixedCoilSet["output_path"]), file_format="hdf5"
)
nested_coils = MixedCoilSet(sym_coils, mixed_coils, check_intersection=False)
if isinstance(coil, str):
coil = load(load_from=request.getfixturevalue(coil)[path], file_format="hdf5")

eq = Equilibrium()
# not attempting to accurately calc B for this test,
# so make the grids very coarse
Expand All @@ -1349,9 +1355,7 @@ def test(c, method):
(c,), _ = optimizer.optimize(c, obj, maxiter=2, ftol=0, xtol=1e-15)

# now check with optimizing geometry and actually check result
objs = [
CoilLength(c, target=target),
]
objs = [CoilLength(c, target=target)]
extra_msg = ""
if isinstance(c, MixedCoilSet):
# just to check they work without error
Expand All @@ -1375,21 +1379,7 @@ def test(c, method):
lengths, target, rtol=rtol, err_msg=f"lengths {c}" + extra_msg
)

spline_coil = mixed_coils.coils[-1].copy()

# single coil
test(FourierPlanarCoil(), "fmintr")
test(FourierRZCoil(), "fmintr")
test(FourierXYZCoil(), "fmintr")
test(spline_coil, "fmintr")

# CoilSet
test(sym_coils, "lsq-exact")
test(asym_coils, "lsq-exact")

# MixedCoilSet
test(mixed_coils, "lsq-exact")
test(nested_coils, "lsq-exact")
test(coil, optimizer)


@pytest.mark.unit
Expand Down
Loading