fixup! feat: add missing_is_symbolic to remake

Author: AayushSabharwal

src/remake.jl

@@ -247,7 +247,8 @@ function remake(prob::BVProblem{uType, tType, iip, nlls}; f = missing, bc = miss
         tspan = prob.tspan
     end
 
-    u0, p = updated_u0_p(prob, u0, p, tspan[1]; interpret_symbolicmap, use_defaults)
+    u0, p = updated_u0_p(
+        prob, u0, p, tspan[1]; interpret_symbolicmap, use_defaults, missing_is_symbolic)
 
     if problem_type === missing
         problem_type = prob.problem_type
@@ -543,19 +544,20 @@ function _updated_u0_p_internal(
         prob, ::Missing, p, t0; interpret_symbolicmap = true,
         use_defaults = false, missing_is_symbolic = true)
     return _updated_u0_p_internal(
-        prob, missing_is_symbolic ? anydict() : state_values(prob), p, t0; interpret_symbolicmap)
+        prob, missing_is_symbolic ? anydict() : state_values(prob),
+        p, t0; interpret_symbolicmap, use_defaults)
 end
 
 function _updated_u0_p_internal(
         prob, u0, ::Missing, t0; interpret_symbolicmap = true,
         use_defaults = false, missing_is_symbolic = true)
     return _updated_u0_p_internal(
         prob, u0, missing_is_symbolic ? anydict() : parameter_values(prob),
-        t0; interpret_symbolicmap)
+        t0; interpret_symbolicmap, use_defaults)
 end
 
 function _updated_u0_p_internal(
-        prob, u0, p, t0; interpret_symbolicmap = true, use_defaults = false)
+        prob, u0, p, t0; interpret_symbolicmap = true, use_defaults = false, kwargs...)
     isu0symbolic = eltype(u0) <: Pair
     ispsymbolic = eltype(p) <: Pair && interpret_symbolicmap
 

test/remake_tests.jl

@@ -121,21 +121,25 @@ for prob in deepcopy(probs)
         @test prob2.p == typeof(prob.p)(p)
 
         # respect defaults (:x), fallback to existing value (:z)
-        prob2 = @inferred baseType remake(prob; u0 = [:y => 0.2], use_defaults = true)
+        prob2 = @inferred baseType remake(
+            prob; u0 = [:y => 0.2], use_defaults = true, missing_is_symbolic = false)
         @test prob2.u0 ≈ [0.1, 0.2, 3.0]
         @test prob2.p == typeof(prob.p)(p) # params unaffected
+        prob2 = @inferred baseType remake(prob; u0 = [:y => 0.2], use_defaults = true)
+        @test prob2.u0 ≈ [0.1, 0.2, 3.0]
+        @test all(prob2.p .≈ [0.1, 20.0, 30.0])
 
         # override defaults
         prob2 = @inferred baseType remake(prob; u0 = [:x => 0.2], use_defaults = true)
         @test prob2.u0 ≈ [0.2, 2.0, 3.0]
-        @test prob2.p == typeof(prob.p)(p)
+        @test all(prob2.p .≈ [0.1, 20.0, 30.0])
 
         prob2 = @inferred baseType remake(prob; p = [:b => 0.2], use_defaults = true)
-        @test prob2.u0 == u0
+        @test prob2.u0 ≈ [0.1, 2.0, 3.0]
         @test all(prob2.p .≈ [0.1, 0.2, 30.0])
 
         prob2 = @inferred baseType remake(prob; p = [:a => 0.2], use_defaults = true)
-        @test prob2.u0 == u0
+        @test prob2.u0 ≈ [0.1, 2.0, 3.0]
         @test all(prob2.p .≈ [0.2, 20.0, 30.0])
 
         empty!(prob.f.sys.defaults)
@@ -152,36 +156,37 @@ for prob in deepcopy(probs)
         @test prob2.u0 == u0
         @test prob2.p == typeof(prob.p)(p)
 
-        prob2 = @inferred baseType remake(prob; u0 = [:x => 0.2])
+        prob2 = @inferred baseType remake(
+            prob; u0 = [:x => 0.2], missing_is_symbolic = false)
         @test prob2.u0 ≈ [0.2, 0.6, 3.0]
         @test prob2.p == typeof(prob.p)(p)
 
         # respect numeric defaults (:z)
         prob2 = @inferred baseType remake(prob; u0 = [:x => 0.2], use_defaults = true)
         @test prob2.u0 ≈ [0.2, 0.6, 9.0]
-        @test prob2.p == typeof(prob.p)(p) # params unaffected
+        @test all(prob2.p .≈ [10.0, 30.0, 0.9])
 
         # override defaults
         prob2 = @inferred baseType remake(prob; u0 = [:y => 0.2])
         @test prob2.u0 ≈ [1.0, 0.2, 3.0]
-        @test prob2.p == typeof(prob.p)(p)
+        @test all(prob2.p .≈ [10.0, 30.0, 30.0])
         prob2 = @inferred baseType remake(prob; u0 = [:y => 0.2], use_defaults = true)
         @test prob2.u0 ≈ [1.0, 0.2, 9.0]
-        @test prob2.p == typeof(prob.p)(p)
+        @test all(prob2.p .≈ [10.0, 30.0, 0.9])
 
         prob2 = @inferred baseType remake(prob; p = [:a => 0.2])
-        @test prob2.u0 == u0
+        @test prob2.u0 ≈ [1.0, 3.0, 3.0]
         @test all(prob2.p .≈ [0.2, 0.6, 30.0])
 
         prob2 = @inferred baseType remake(prob; p = [:a => 0.2], use_defaults = true)
-        @test prob2.u0 == u0
+        @test prob2.u0 ≈ [1.0, 3.0, 9.0]
         @test all(prob2.p .≈ [0.2, 0.6, 0.9])
 
         prob2 = @inferred baseType remake(prob; p = [:b => 0.2])
-        @test prob2.u0 == u0
+        @test prob2.u0 ≈ [1.0, 3.0, 3.0]
         @test all(prob2.p .≈ [10.0, 0.2, 30.0])
         prob2 = @inferred baseType remake(prob; p = [:b => 0.2], use_defaults = true)
-        @test prob2.u0 == u0
+        @test prob2.u0 ≈ [1.0, 3.0, 9.0]
         @test all(prob2.p .≈ [10.0, 0.2, 0.9])
 
         empty!(prob.f.sys.defaults)