Skip to content

Improve ComposedScalarOperator update and concretization #323

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

Merged
merged 1 commit into from
Nov 13, 2025
Merged

Improve ComposedScalarOperator update and concretization #323

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 14 additions & 12 deletions src/scalar.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ struct ComposedScalarOperator{T, O} <: AbstractSciMLScalarOperator{T}

function ComposedScalarOperator(ops::NTuple{N, AbstractSciMLScalarOperator}) where {N}
@assert !isempty(ops)
T = promote_type(eltype.(ops)...)
T = reduce(Base.promote_eltype, ops)
new{T, typeof(ops)}(ops)
end
end
Expand Down Expand Up @@ -395,7 +395,7 @@ end

function Base.convert(T::Type{<:Number}, α::ComposedScalarOperator)
iszero(α) && return zero(T)
prod(convert.(T, α.ops))
prod(concretize, α.ops)
end

function Base.show(io::IO, α::ComposedScalarOperator)
Expand All @@ -410,20 +410,22 @@ end
Base.conj(L::ComposedScalarOperator) = ComposedScalarOperator(conj.(L.ops))
Base.:-(α::AbstractSciMLScalarOperator{T}) where {T} = (-one(T)) * α

function update_coefficients(L::ComposedScalarOperator, u, p, t; kwargs...)
ops = ()
for op in L.ops
ops = (ops..., update_coefficients(op, u, p, t; kwargs...))
@generated function update_coefficients(L::ComposedScalarOperator, u, p, t; kwargs...)
N = length(L.parameters[2].parameters)
quote
ops = Base.@ntuple $N i -> update_coefficients(L.ops[i], u, p, t; kwargs...)
ComposedScalarOperator(ops)
end

ComposedScalarOperator(ops)
end
function update_coefficients!(L::ComposedScalarOperator, u, p, t; kwargs...)
for op in L.ops
update_coefficients!(op, u, p, t; kwargs...)

@generated function update_coefficients!(L::ComposedScalarOperator, u, p, t; kwargs...)
N = length(L.parameters[2].parameters)
quote
Base.@nexprs $N i -> update_coefficients!(L.ops[i], u, p, t; kwargs...)
nothing
end
nothing
end

function (α::ComposedScalarOperator)(v::AbstractArray, u, p, t; kwargs...)
α = update_coefficients(α, u, p, t; kwargs...)
convert(Number, α) * v
Expand Down
Loading