Skip to content

Commit 212c27f

Browse files
committed
More fix for tune_parameters in FIRK
1 parent a35182d commit 212c27f

1 file changed

Lines changed: 12 additions & 12 deletions

File tree

lib/BoundaryValueDiffEqFIRK/src/utils.jl

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -41,37 +41,37 @@ end
4141
@inline __K0_on_u0(
4242
prob,
4343
stage;
44-
fit_parameters = false
45-
) = __K0_on_u0(prob, prob.u0, stage; fit_parameters = fit_parameters)
44+
tune_parameters = false
45+
) = __K0_on_u0(prob, prob.u0, stage; tune_parameters = tune_parameters)
4646
@inline __K0_on_u0(
4747
prob,
4848
u0::AbstractArray,
4949
stage;
50-
fit_parameters = false
51-
) = ifelse(fit_parameters, repeat(vcat(u0, __tunable_part(prob.p)), 1, stage), repeat(u0, 1, stage))
52-
@inline function __K0_on_u0(prob, u0::AbstractVector{<:AbstractArray}, stage; fit_parameters = false)
50+
tune_parameters = false
51+
) = ifelse(tune_parameters, repeat(vcat(u0, __tunable_part(prob.p)), 1, stage), repeat(u0, 1, stage))
52+
@inline function __K0_on_u0(prob, u0::AbstractVector{<:AbstractArray}, stage; tune_parameters = false)
5353
u0_mat = hcat(u0...)
5454
avg_u0 = vec(sum(u0_mat, dims = 2)) / size(u0_mat, 2)
55-
fit_parameters && return repeat(vcat(avg_u0, __tunable_part(prob.p)), 1, stage)
55+
tune_parameters && return repeat(vcat(avg_u0, __tunable_part(prob.p)), 1, stage)
5656
return repeat(avg_u0, 1, stage)
5757
end
58-
@inline function __K0_on_u0(prob, u0::AbstractVectorOfArray, stage; fit_parameters = false)
58+
@inline function __K0_on_u0(prob, u0::AbstractVectorOfArray, stage; tune_parameters = false)
5959
u0_mat = hcat(u0.u...)
6060
avg_u0 = vec(sum(u0_mat, dims = 2)) / size(u0_mat, 2)
61-
fit_parameters && return repeat(vcat(avg_u0, __tunable_part(prob.p)), 1, stage)
61+
tune_parameters && return repeat(vcat(avg_u0, __tunable_part(prob.p)), 1, stage)
6262
return repeat(avg_u0, 1, stage)
6363
end
64-
@inline function __K0_on_u0(prob, u0::SciMLBase.ODESolution, stage; fit_parameters = false)
64+
@inline function __K0_on_u0(prob, u0::SciMLBase.ODESolution, stage; tune_parameters = false)
6565
u0_mat = hcat(u0.u...)
6666
avg_u0 = vec(sum(u0_mat, dims = 2)) / size(u0_mat, 2)
67-
fit_parameters && return repeat(vcat(avg_u0, __tunable_part(prob.p)), 1, stage)
67+
tune_parameters && return repeat(vcat(avg_u0, __tunable_part(prob.p)), 1, stage)
6868
return repeat(avg_u0, 1, stage)
6969
end
70-
@inline function __K0_on_u0(prob, u0::F, stage; fit_parameters = false) where {
70+
@inline function __K0_on_u0(prob, u0::F, stage; tune_parameters = false) where {
7171
F <:
7272
Function,
7373
}
7474
avg_u0 = u0(prob.p, first(prob.tspan))
75-
fit_parameters && return repeat(vcat(avg_u0, __tunable_part(prob.p)), 1, stage)
75+
tune_parameters && return repeat(vcat(avg_u0, __tunable_part(prob.p)), 1, stage)
7676
return repeat(avg_u0, 1, stage)
7777
end

0 commit comments

Comments
 (0)