@@ -190,7 +190,6 @@ function Base.showerror(io::IO, e::NaNTspanError)
190
190
println (io, TruncatedStacktraces. VERBOSE_MSG)
191
191
end
192
192
193
-
194
193
const NON_SOLVER_MESSAGE = """
195
194
The arguments to solve are incorrect.
196
195
The second argument must be a solver choice, `solve(prob,alg)`
454
453
455
454
function init_call (_prob, args... ; merge_callbacks = true , kwargshandle = nothing ,
456
455
kwargs... )
457
-
458
456
kwargshandle = kwargshandle === nothing ? KeywordArgError : kwargshandle
459
- kwargshandle = has_kwargs (_prob) && haskey (_prob. kwargs, :kwargshandle ) ? _prob. kwargs[:kwargshandle ] : kwargshandle
457
+ kwargshandle = has_kwargs (_prob) && haskey (_prob. kwargs, :kwargshandle ) ?
458
+ _prob. kwargs[:kwargshandle ] : kwargshandle
460
459
461
460
if has_kwargs (_prob)
462
461
if merge_callbacks && haskey (_prob. kwargs, :callback ) && haskey (kwargs, :callback )
534
533
535
534
function solve_call (_prob, args... ; merge_callbacks = true , kwargshandle = nothing ,
536
535
kwargs... )
537
-
538
536
kwargshandle = kwargshandle === nothing ? KeywordArgError : kwargshandle
539
- kwargshandle = has_kwargs (_prob) && haskey (_prob. kwargs, :kwargshandle ) ? _prob. kwargs[:kwargshandle ] : kwargshandle
537
+ kwargshandle = has_kwargs (_prob) && haskey (_prob. kwargs, :kwargshandle ) ?
538
+ _prob. kwargs[:kwargshandle ] : kwargshandle
540
539
541
540
if has_kwargs (_prob)
542
541
if merge_callbacks && haskey (_prob. kwargs, :callback ) && haskey (kwargs, :callback )
@@ -1452,9 +1451,9 @@ function _solve_adjoint(prob, sensealg, u0, p, originator, args...; merge_callba
1452
1451
end
1453
1452
1454
1453
if isempty (args)
1455
- _concrete_solve_adjoint (_prob, nothing , sensealg, u0, p, originator; kwargs... )
1454
+ _concrete_solve_adjoint (_prob, alg , sensealg, u0, p, originator; kwargs... )
1456
1455
else
1457
- _concrete_solve_adjoint (_prob, args[ 1 ] , sensealg, u0, p, originator,
1456
+ _concrete_solve_adjoint (_prob, alg , sensealg, u0, p, originator,
1458
1457
Base. tail (args)... ; kwargs... )
1459
1458
end
1460
1459
end
0 commit comments