Merge branch 'master' into as/scimlfn-specialization

Author: ChrisRackauckas

Project.toml

@@ -1,7 +1,7 @@
 name = "SciMLBase"
 uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
 authors = ["Chris Rackauckas <[email protected]> and contributors"]
-version = "2.74.1"
+version = "2.75.0"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"

src/initialization.jl

@@ -301,11 +301,11 @@ end
 function initialization_status(prob::AbstractSciMLProblem)
     has_initialization_data(prob.f) || return nothing
 
-    sys = prob.f.initialization_data.initializeprob.f.sys
-    isnothing(sys) && return nothing
+    iprob = prob.f.initialization_data.initializeprob
+    isnothing(prob) && return nothing
 
-    neqs = length(equations(sys))
-    nunknowns = length(unknowns(sys))
+    neqs = length(iprob.f(iprob.u0, iprob.p))
+    nunknowns = length(iprob.u0)
 
     if neqs > nunknowns
         return OVERDETERMINED

src/problems/problem_utils.jl

@@ -29,11 +29,15 @@ function Base.summary(io::IO, prob::AbstractDEProblem)
         no_color,
         ". In-place: ", type_color, isinplace(prob), no_color)
     init = initialization_status(prob)
-    !isnothing(init) && print(io, "Initialization status: ", type_color,
-        initialization_status(prob), no_color)
-    println(io)
-    print(io, "Non-trivial mass matrix: ", type_color,
-        !(prob.f.mass_matrix isa LinearAlgebra.UniformScaling{Bool}), no_color)
+    !isnothing(init) && begin 
+        println(io)
+        print(io, "Initialization status: ", type_color, initialization_status(prob), no_color)
+    end
+
+    hasproperty(prob.f, :mass_matrix) && begin
+        println(io)
+        print(io, "Non-trivial mass matrix: ", type_color, !(prob.f.mass_matrix isa LinearAlgebra.UniformScaling{Bool}), no_color)
+    end
 end
 
 function Base.summary(io::IO, prob::AbstractLinearProblem)

src/remake.jl

@@ -1085,6 +1085,10 @@ calling `SymbolicIndexingInterface.symbolic_container`, provided for dispatch. R
 the updated `newu0` and `newp`.
 """
 function late_binding_update_u0_p(prob, root_indp, u0, p, t0, newu0, newp)
+    if hasmethod(symbolic_container, Tuple{typeof(root_indp)}) &&
+       (sc = symbolic_container(root_indp)) !== root_indp
+        return late_binding_update_u0_p(prob, sc, u0, p, t0, newu0, newp)
+    end
     return newu0, newp
 end
 
@@ -1096,10 +1100,6 @@ Calls `late_binding_update_u0_p(prob, root_indp, u0, p, t0, newu0, newp)` after
 """
 function late_binding_update_u0_p(prob, u0, p, t0, newu0, newp)
     root_indp = prob
-    while hasmethod(symbolic_container, Tuple{typeof(root_indp)}) &&
-        (sc = symbolic_container(root_indp)) !== root_indp
-        root_indp = sc
-    end
     return late_binding_update_u0_p(prob, root_indp, u0, p, t0, newu0, newp)
 end
 

src/solutions/ode_solutions.jl

@@ -287,8 +287,7 @@ function (sol::AbstractODESolution)(t::Number, ::Type{deriv}, idxs,
         ps = parameter_values(discs)
         for ts_idx in eachindex(discs)
             partition = discs[ts_idx]
-            interp_val = ConstantInterpolation(partition.t, partition.u)(
-                t, nothing, deriv, nothing, continuity)
+            interp_val = _hold_discrete(partition.u, partition.t, t)
             ps = with_updated_parameter_timeseries_values(sol, ps, ts_idx => interp_val)
         end
     end
@@ -312,8 +311,7 @@ function (sol::AbstractODESolution)(t::Number, ::Type{deriv}, idxs::AbstractVect
         ps = parameter_values(discs)
         for ts_idx in eachindex(discs)
             partition = discs[ts_idx]
-            interp_val = ConstantInterpolation(partition.t, partition.u)(
-                t, nothing, deriv, nothing, continuity)
+            interp_val = _hold_discrete(partition.u, partition.t, t)
             ps = with_updated_parameter_timeseries_values(sol, ps, ts_idx => interp_val)
         end
     end

test/downstream/Project.toml

@@ -34,7 +34,7 @@ DelayDiffEq = "5"
 DiffEqCallbacks = "3, 4"
 ForwardDiff = "0.10"
 JumpProcesses = "9.10"
-ModelingToolkit = "9.56"
+ModelingToolkit = "9.64.1"
 ModelingToolkitStandardLibrary = "2.7"
 NonlinearSolve = "2, 3, 4"
 Optimization = "4"

test/downstream/initialization.jl

@@ -58,3 +58,21 @@ end
     @test getp(sys, p)(pobj) ≈ 1.0
     @test getp(sys, q)(pobj) ≈ sqrt(2)
 end
+
+@testset "Initialization info printed" begin
+    @parameters g
+    @variables x(t) y(t) [state_priority = 10] λ(t)
+    eqs = [D(D(x)) ~ λ * x
+           D(D(y)) ~ λ * y - g
+           x^2 + y^2 ~ 1]
+    @mtkbuild pend = ODESystem(eqs, t)
+
+    prob = ODEProblem(pend, [x => 1, y => 0], (0.0, 1.5), [g => 1], guesses = [λ => 1])
+    @test occursin("Initialization status: FULLY_DETERMINED", sprint(summary, prob))
+
+    prob = ODEProblem(pend, [], (0.0, 1.5), [g => 1], guesses = [λ => 1, x => 1, y => 0])
+    @test occursin("Initialization status: UNDERDETERMINED", sprint(summary, prob))
+
+    prob = ODEProblem(pend, [x => 1, y => 0, λ => 2], (0.0, 1.5), [g => 1])
+    @test occursin("Initialization status: OVERDETERMINED", sprint(summary, prob))
+end

test/downstream/solution_interface.jl

@@ -215,7 +215,7 @@ end
             @test sol[x] == xvals
             @test is_parameter(sol, p)
             @test parameter_index(sol, p) == parameter_index(sys, p)
-            @test isequal(only(parameter_symbols(sol)), p)
+            @test any(isequal(p), parameter_symbols(sol))
             @test is_independent_variable(sol, t)
 
             tmp = copy(prob.u0)
@@ -341,3 +341,12 @@ end
         @test _ss isa SciMLBase.SavedSubsystem
     end
 end
+
+@testset "Interpolation after final discrete save" begin
+    @variables x(t) y(t)
+    @parameters start
+    @mtkbuild sys=ODESystem([D(x) ~ y, y ~ ifelse(t < start, 1.0, 2.0)], t) additional_passes=[ModelingToolkit.IfLifting]
+    prob = ODEProblem(sys, [x => 0.0], (0.0, 1.0), [start => 0.5])
+    sol = solve(prob)
+    @test sol(0.6, idxs = y) ≈ 2.0
+end