physics/pdme
2
0
Fork 0
Code Issues Pull Requests 9 Projects Releases Wiki Activity

Slight refactor to pull solutions into model
All checks were successful
gitea-physics/pdme/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Deepak Mallubhotla
2022-01-02 17:53:59 -06:00
parent ac308b6658
commit 2c599234f8
4 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/solver/test_solve_basic_fixed_z.py → tests/model/test_solve_basic_fixed_z.py
View File

@@ -3,7 +3,6 @@ from pdme.measurement import OscillatingDipole, OscillatingDipoleArrangement
import logging
import numpy
import itertools
import pdme.solver
import pytest
@@ -12,7 +11,7 @@ def test_fixed_z_plane_model_solve_error_initial():
model = FixedZPlaneModel(4, -10, 10, -10, 10, 1)
with pytest.raises(ValueError):
pdme.solver.sol(model, [], initial_pt=[1, 2])
model.solve([], initial_pt=[1, 2])
def test_fixed_z_plane_model_solve_basic():
@@ -28,13 +27,13 @@ def test_fixed_z_plane_model_solve_basic():
# from the dipole, these are the unspecified variables in ((0, 0, pz), (sx, sy, 4), w)
expected_solution = [2, 1, 2, 1]
result = pdme.solver.sol(model, dots)
result = model.solve(dots)
logging.info(result)
assert result.success
numpy.testing.assert_allclose(result.x, expected_solution, err_msg="Even well specified problem solution was wrong.", rtol=1e-6, atol=1e-11)
# Do it again with an initial point
result = pdme.solver.sol(model, dots, initial_pt=[2, 2, 2, 2])
result = model.solve(dots, initial_pt=[2, 2, 2, 2])
logging.info(result)
assert result.success
numpy.testing.assert_allclose(result.x, expected_solution, err_msg="Even well specified problem solution was wrong.", rtol=1e-6, atol=1e-11)