Merge branch 'master' into qqy/bvp_opt

ErikQQY · web-flow · commit 5cc940ab6a8f · 2025-07-21T23:53:16.000+08:00
diff --git a/lib/BoundaryValueDiffEqAscher/Project.toml b/lib/BoundaryValueDiffEqAscher/Project.toml
@@ -1,7 +1,7 @@
 name = "BoundaryValueDiffEqAscher"
 uuid = "7227322d-7511-4e07-9247-ad6ff830280e"
 authors = ["Qingyu Qu <erikqqy123@gmail.com>"]
-version = "1.7.0"
+version = "1.8.0"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
diff --git a/lib/BoundaryValueDiffEqCore/Project.toml b/lib/BoundaryValueDiffEqCore/Project.toml
@@ -1,7 +1,7 @@
 name = "BoundaryValueDiffEqCore"
 uuid = "56b672f2-a5fe-4263-ab2d-da677488eb3a"
 authors = ["Qingyu Qu <erikqqy123@gmail.com>"]
-version = "1.10.0"
+version = "1.11.1"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
@@ -43,7 +43,7 @@ Reexport = "1.2"
 SciMLBase = "2.82"
 Setfield = "1"
 SparseArrays = "1.10"
-SparseConnectivityTracer = "0.6.13"
+SparseConnectivityTracer = "0.6.13, 1"
 SparseMatrixColorings = "0.4.13"
 Test = "1.10"
 julia = "1.10"
diff --git a/lib/BoundaryValueDiffEqCore/src/utils.jl b/lib/BoundaryValueDiffEqCore/src/utils.jl
@@ -301,18 +301,22 @@ end
 
 function __initial_guess(f::F, p::P, t::T; fit_parameters = false) where {F, P, T}
     if hasmethod(f, Tuple{P, T})
-        p isa SciMLBase.NullParameters &&
-            throw(ArgumentError("`fit_parameters` is true but `prob.p` is not set."))
-        fit_parameters && return vcat(f(p, t), p)
+        if fit_parameters
+            p isa SciMLBase.NullParameters &&
+                throw(ArgumentError("`fit_parameters` is true but `prob.p` is not set."))
+            return vcat(f(p, t), p)
+        end
         return f(p, t)
     elseif hasmethod(f, Tuple{T})
         Base.depwarn("initial guess function must take 2 inputs `(p, t)` instead of just \
                      `t`. The single argument version has been deprecated and will be \
                      removed in the next major release of SciMLBase.",
             :__initial_guess)
-        p isa SciMLBase.NullParameters &&
-            throw(ArgumentError("`fit_parameters` is true but `prob.p` is not set."))
-        fit_parameters && return vcat(f(t), p)
+        if fit_parameters
+            p isa SciMLBase.NullParameters &&
+                throw(ArgumentError("`fit_parameters` is true but `prob.p` is not set."))
+            return vcat(f(t), p)
+        end
         return f(t)
     else
         throw(ArgumentError("`initial_guess` must be a function of the form `f(p, t)`"))
diff --git a/lib/BoundaryValueDiffEqFIRK/Project.toml b/lib/BoundaryValueDiffEqFIRK/Project.toml
@@ -1,6 +1,6 @@
 name = "BoundaryValueDiffEqFIRK"
 uuid = "85d9eb09-370e-4000-bb32-543851f73618"
-version = "1.8.1"
+version = "1.9.0"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
diff --git a/lib/BoundaryValueDiffEqFIRK/test/expanded/firk_basic_tests.jl b/lib/BoundaryValueDiffEqFIRK/test/expanded/firk_basic_tests.jl
@@ -449,7 +449,7 @@ end
         bcresid_prototype = (zeros(2), zeros(1)), fit_parameters = true)
     sol = solve(bvp, RadauIIa5(), dt = 0.05)
 
-    @test sol.prob.p ≈ [17.09658] atol=1e-5
+    @test sol.prob.p≈[17.09658] atol=1e-5
 
     tspan = (0.0, pi)
     function f!(du, u, p, t)
@@ -468,5 +468,5 @@ end
         bcresid_prototype = (zeros(2), zeros(1)), fit_parameters = true)
     sol = solve(bvp, RadauIIa5(), dt = 0.05)
 
-    @test sol.prob.p ≈ [17.09658] atol=1e-5
+    @test sol.prob.p≈[17.09658] atol=1e-5
 end
diff --git a/lib/BoundaryValueDiffEqFIRK/test/nested/firk_basic_tests.jl b/lib/BoundaryValueDiffEqFIRK/test/nested/firk_basic_tests.jl
@@ -540,7 +540,7 @@ end
         bcresid_prototype = (zeros(2), zeros(1)), fit_parameters = true)
     sol = solve(bvp, RadauIIa5(; nested_nlsolve = true), dt = 0.05)
 
-    @test sol.prob.p ≈ [17.09658] atol=1e-5
+    @test sol.prob.p≈[17.09658] atol=1e-5
 
     tspan = (0.0, pi)
     function f!(du, u, p, t)
@@ -559,5 +559,5 @@ end
         bcresid_prototype = (zeros(2), zeros(1)), fit_parameters = true)
     sol = solve(bvp, RadauIIa5(; nested_nlsolve = true), dt = 0.05)
 
-    @test sol.prob.p ≈ [17.09658] atol=1e-5
+    @test sol.prob.p≈[17.09658] atol=1e-5
 end
diff --git a/lib/BoundaryValueDiffEqMIRK/Project.toml b/lib/BoundaryValueDiffEqMIRK/Project.toml
@@ -1,6 +1,6 @@
 name = "BoundaryValueDiffEqMIRK"
 uuid = "1a22d4ce-7765-49ea-b6f2-13c8438986a6"
-version = "1.8.1"
+version = "1.9.0"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
diff --git a/lib/BoundaryValueDiffEqMIRK/test/mirk_basic_tests.jl b/lib/BoundaryValueDiffEqMIRK/test/mirk_basic_tests.jl
@@ -441,7 +441,7 @@ end
         bcresid_prototype = (zeros(2), zeros(1)), fit_parameters = true)
     sol = solve(bvp, MIRK4(), dt = 0.05)
 
-    @test sol.prob.p ≈ [17.09658] atol=1e-5
+    @test sol.prob.p≈[17.09658] atol=1e-5
 
     tspan = (0.0, pi)
     function f!(du, u, p, t)
@@ -460,7 +460,7 @@ end
         bcresid_prototype = (zeros(2), zeros(1)), fit_parameters = true)
     sol = solve(bvp, MIRK4(), dt = 0.05)
 
-    @test sol.prob.p ≈ [17.09658] atol=1e-5
+    @test sol.prob.p≈[17.09658] atol=1e-5
 end
 
 @testitem "Convergence with optimization based solver" setup=[MIRKConvergenceTests] begin
diff --git a/lib/BoundaryValueDiffEqMIRKN/Project.toml b/lib/BoundaryValueDiffEqMIRKN/Project.toml
@@ -1,7 +1,7 @@
 name = "BoundaryValueDiffEqMIRKN"
 uuid = "9255f1d6-53bf-473e-b6bd-23f1ff009da4"
 authors = ["Qingyu Qu <erikqqy123@gmail.com>"]
-version = "1.7.1"
+version = "1.8.0"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
diff --git a/lib/BoundaryValueDiffEqShooting/Project.toml b/lib/BoundaryValueDiffEqShooting/Project.toml
@@ -1,6 +1,6 @@
 name = "BoundaryValueDiffEqShooting"
 uuid = "ed55bfe0-3725-4db6-871e-a1dc9f42a757"
-version = "1.8.1"
+version = "1.9.0"
 
 [deps]
 ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
diff --git a/lib/BoundaryValueDiffEqShooting/src/multiple_shooting.jl b/lib/BoundaryValueDiffEqShooting/src/multiple_shooting.jl
@@ -408,18 +408,15 @@ end
 # Problem has initial guess
 @views function __multiple_shooting_initialize!(
         nodes, prob, alg, ::Val{true}, nshoots::Int, odecache; kwargs...)
-    (; u0, tspan) = prob
+    (; u0, tspan, p) = prob
 
     resize!(nodes, nshoots + 1)
     nodes .= range(tspan[1], tspan[2]; length = nshoots + 1)
-
-    # NOTE: We don't check `u0 isa Function` since `u0` in-principle can be a callable
-    #       struct
-    u0_ = u0 isa VectorOfArray ? u0 : [__initial_guess(u0, prob.p, t) for t in nodes]
+    u0_ = __initial_guess_on_mesh(u0, nodes, p)
 
     N = length(first(u0_))
     u_at_nodes = similar(first(u0_), (nshoots + 1) * N)
-    recursive_flatten!(u_at_nodes, u0_)
+    recursive_flatten!(u_at_nodes, u0_.u)
 
     return u_at_nodes
 end
diff --git a/lib/BoundaryValueDiffEqShooting/test/basic_problems_tests.jl b/lib/BoundaryValueDiffEqShooting/test/basic_problems_tests.jl
@@ -366,3 +366,50 @@ end
         @test norm(sol.resid, Inf) < 1e-6
     end
 end
+
+@testitem "Shooting with heterogeneous initial guess" begin
+    using BoundaryValueDiffEqShooting, OrdinaryDiffEqVerner, LinearAlgebra
+    g = 9.81
+    L = 1.0
+    tspan = (0.0, pi / 2.0)
+    function simplependulum!(du, u, p, t)
+        θ = u[1]
+        dθ = u[2]
+        du[1] = dθ
+        du[2] = -(g / L) * sin(θ)
+    end
+
+    function bc2a!(resid_a, u_a, p)
+        resid_a[1] = u_a[1] + pi / 2
+    end
+    function bc2b!(resid_b, u_b, p)
+        resid_b[1] = u_b[1] - pi / 2
+    end
+
+    function initialGuess(p, t)
+        u1 = t * (-3.1444 * t + 6.9895) - 1.5708
+        u2 = t * (t * (6.3342 * t - 19.208) + 9.6822) + 3.9882
+        return [u1, u2]
+    end
+
+    u0 = [pi / 2, pi / 2]
+    bvp2 = TwoPointBVProblem(simplependulum!, (bc2a!, bc2b!), u0, tspan;
+        bcresid_prototype = (zeros(1), zeros(1)))
+    sol2 = solve(bvp2, MultipleShooting(5, Vern7()))
+    @test SciMLBase.successful_retcode(sol2)
+
+    bvp3 = TwoPointBVProblem(simplependulum!, (bc2a!, bc2b!), sol2, tspan;
+        bcresid_prototype = (zeros(1), zeros(1)))
+    sol3 = solve(bvp3, MultipleShooting(5, Vern7()))
+    @test SciMLBase.successful_retcode(sol3)
+
+    bvp4 = TwoPointBVProblem(simplependulum!, (bc2a!, bc2b!), sol2.u, tspan;
+        bcresid_prototype = (zeros(1), zeros(1)))
+    sol4 = solve(bvp4, MultipleShooting(5, Vern7()))
+    @test SciMLBase.successful_retcode(sol4)
+
+    bvp5 = TwoPointBVProblem(simplependulum!, (bc2a!, bc2b!), initialGuess,
+        tspan; bcresid_prototype = (zeros(1), zeros(1)))
+    sol5 = solve(bvp5, MultipleShooting(5, Vern7()))
+    @test SciMLBase.successful_retcode(sol5)
+end
