Skip to content

Commit 20bf783

Browse files
author
Jack Dunham
committed
The sweep_solve callbacks now get called without any keyword arguments.
1 parent 613d533 commit 20bf783

File tree

3 files changed

+8
-10
lines changed

3 files changed

+8
-10
lines changed

src/solvers/applyexp.jl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ end
5757
function default_sweep_callback(
5858
sweep_iterator::SweepIterator{<:ApplyExpProblem};
5959
exponent_description="exponent",
60-
outputlevel,
60+
outputlevel=0,
6161
process_time=identity,
62-
kwargs...,
6362
)
6463
if outputlevel >= 1
6564
the_problem = problem(sweep_iterator)
@@ -89,7 +88,7 @@ function applyexp(
8988
]
9089
sweep_iter = SweepIterator(init_prob, kws_array)
9190

92-
converged_prob = sweep_solve(sweep_callback, sweep_iter; outputlevel=0)
91+
converged_prob = sweep_solve(sweep_callback, sweep_iter)
9392

9493
return state(converged_prob)
9594
end
@@ -110,8 +109,8 @@ function time_evolve(
110109
time_points,
111110
init_state;
112111
process_time=process_real_times,
113-
sweep_callback=(a...; k...) ->
114-
default_sweep_callback(a...; exponent_description="time", process_time, k...),
112+
sweep_callback=iter ->
113+
default_sweep_callback(iter; exponent_description="time", process_time),
115114
sweep_kwargs...,
116115
)
117116
exponents = [-im * t for t in time_points]

src/solvers/eigsolve.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ function default_kwargs(::typeof(update!), ::Type{<:EigsolveProblem})
4646
end
4747

4848
function default_sweep_callback(
49-
sweep_iterator::SweepIterator{<:EigsolveProblem}; outputlevel
49+
sweep_iterator::SweepIterator{<:EigsolveProblem}; outputlevel=0
5050
)
5151
if outputlevel >= 1
5252
nsweeps = length(sweep_iterator)
@@ -69,7 +69,7 @@ function eigsolve(operator, init_state; nsweeps, nsites=1, outputlevel=0, sweep_
6969
state=align_indices(init_state), operator=ProjTTN(align_indices(operator))
7070
)
7171
sweep_iter = SweepIterator(init_prob, nsweeps; nsites, outputlevel, sweep_kwargs...)
72-
prob = sweep_solve(sweep_iter; outputlevel)
72+
prob = sweep_solve(sweep_iter)
7373
return eigenvalue(prob), state(prob)
7474
end
7575

src/solvers/sweep_solve.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ function sweep_solve(
1111
sweep_iterator;
1212
sweep_callback=default_sweep_callback,
1313
region_callback=default_region_callback,
14-
outputlevel=0,
1514
)
1615
# Don't compute the region iteration automatically as we wish to insert a callback.
1716
for _ in NoComputeStep(sweep_iterator)
1817
for _ in region_iterator(sweep_iterator)
19-
region_callback(sweep_iterator; outputlevel=outputlevel)
18+
region_callback(sweep_iterator)
2019
end
21-
sweep_callback(sweep_iterator; outputlevel=outputlevel)
20+
sweep_callback(sweep_iterator)
2221
end
2322
return problem(sweep_iterator)
2423
end

0 commit comments

Comments
 (0)