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

Milzj patch 1 #17

Merged
merged 6 commits into from
Oct 24, 2024
Merged

Milzj patch 1 #17

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6826a2e
Update test_nonconstant_bounds.py
milzj Feb 18, 2024
3193b31
Update test_nonconstant_bounds.py
milzj Feb 18, 2024
27f60b1
Update test_nonconstant_bounds.py
milzj Feb 18, 2024
195ffc8
Update test_nonconstant_bounds.py
milzj Feb 18, 2024
943d3a3
Update test_nonconstant_bounds.py
milzj Feb 18, 2024
85d0edb
Update test_nonconstant_bounds.py
milzj Feb 18, 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
20 changes: 13 additions & 7 deletions tests/algorithms/test_nonconstant_bounds.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def solve_problem(n, n_ref, u_init=None, maxiter=1000, gtol=1e-15, ftol=-np.inf

# x0 should be a grid point

beta = 0.0
beta = 0.001
lb = Expression("-1", degree = 0)
ub = Expression("1+0.1*sin(2*pi*x[0])", degree = 0)

Expand All @@ -45,7 +45,12 @@ def solve_problem(n, n_ref, u_init=None, maxiter=1000, gtol=1e-15, ftol=-np.inf

if u_init != None:
u = project(u_init, U)

u_vec = u.vector()[:]
lb_vec = project(lb, U).vector()[:]
ub_vec = project(ub, U).vector()[:]
u_vec = np.clip(u_vec, lb_vec, ub_vec)
u.vector()[:] = u_vec

V = FunctionSpace(mesh, "CG", 1)
y = Function(V)
w = TrialFunction(V)
Expand All @@ -57,7 +62,7 @@ def solve_problem(n, n_ref, u_init=None, maxiter=1000, gtol=1e-15, ftol=-np.inf
L = u*v*dx
A, b = assemble_system(a, L, bc)

solver = LUSolver(A, "petsc")
solver = KrylovSolver(A, "cg")
solver.solve(y.vector(), b)

J = assemble(0.5*inner(y-yd,y-yd)*dx)
Expand All @@ -84,7 +89,7 @@ def solve_problem(n, n_ref, u_init=None, maxiter=1000, gtol=1e-15, ftol=-np.inf
def test_convergence_rate():
"""Code verification for a one-dimensional boundary value problem.

abs(dual_gap(u_h)) should converge with rate h^2
dual_gap(u_h) should converge with rate h^2
"""

n_ref = 2**16
Expand Down Expand Up @@ -112,13 +117,14 @@ def test_convergence_rate():

ndrop = 0
x_vec = ns
y_vec = np.abs(dual_gaps)
y_vec = dual_gaps
X = np.ones((len(x_vec[ndrop::]), 2)); X[:, 1] = np.log(x_vec[ndrop::]) # design matrix
x, residudals, rank, s = np.linalg.lstsq(X, np.log(y_vec[ndrop::]), rcond=None)

rate = x[1]
constant = np.exp(x[0])

assert np.isclose(-rate, 1.0, rtol=0.0, atol=0.1)

fig, ax = plt.subplots()
ax.plot([n for n in ns], dual_gaps)

Expand All @@ -132,7 +138,7 @@ def test_convergence_rate():
fig.savefig("convergence_rates_bilinear.png")


assert np.isclose(np.median(rates), 2.0, rtol=0.0, atol=0.1)
assert np.isclose(np.median(rates), 1.0, rtol=0.0, atol=0.1)

if __name__ == "__main__":

Expand Down