remove instances of

Author: vyudu

src/systems/discrete_system/discrete_system.jl

@@ -302,7 +302,6 @@ function SciMLBase.DiscreteProblem(
         parammap = SciMLBase.NullParameters();
         eval_module = @__MODULE__,
         eval_expression = false,
-        use_union = false,
         kwargs...
 )
     if !iscomplete(sys)

src/systems/discrete_system/implicit_discrete_system.jl

@@ -321,7 +321,6 @@ function SciMLBase.ImplicitDiscreteProblem(
         parammap = SciMLBase.NullParameters();
         eval_module = @__MODULE__,
         eval_expression = false,
-        use_union = false,
         kwargs...
 )
     if !iscomplete(sys)

src/systems/jumps/jumpsystem.jl

@@ -383,7 +383,6 @@ end
 ```julia
 DiffEqBase.DiscreteProblem(sys::JumpSystem, u0map, tspan,
                            parammap = DiffEqBase.NullParameters;
-                           use_union = true,
                            kwargs...)
 ```
 
@@ -403,7 +402,6 @@ dprob = DiscreteProblem(complete(js), u₀map, tspan, parammap)
 """
 function DiffEqBase.DiscreteProblem(sys::JumpSystem, u0map, tspan::Union{Tuple, Nothing},
         parammap = DiffEqBase.NullParameters();
-        use_union = true,
         eval_expression = false,
         eval_module = @__MODULE__,
         kwargs...)
@@ -416,7 +414,7 @@ function DiffEqBase.DiscreteProblem(sys::JumpSystem, u0map, tspan::Union{Tuple,
     end
 
     _f, u0, p = process_SciMLProblem(EmptySciMLFunction, sys, u0map, parammap;
-        t = tspan === nothing ? nothing : tspan[1], use_union, tofloat = false, check_length = false, build_initializeprob = false)
+        t = tspan === nothing ? nothing : tspan[1], tofloat = false, check_length = false, build_initializeprob = false)
     f = DiffEqBase.DISCRETE_INPLACE_DEFAULT
 
     observedfun = ObservedFunctionCache(
@@ -451,14 +449,13 @@ struct DiscreteProblemExpr{iip} end
 
 function DiscreteProblemExpr{iip}(sys::JumpSystem, u0map, tspan::Union{Tuple, Nothing},
         parammap = DiffEqBase.NullParameters();
-        use_union = true,
         kwargs...) where {iip}
     if !iscomplete(sys)
         error("A completed `JumpSystem` is required. Call `complete` or `structural_simplify` on the system before creating a `DiscreteProblemExpr`")
     end
 
     _, u0, p = process_SciMLProblem(EmptySciMLFunction, sys, u0map, parammap;
-        t = tspan === nothing ? nothing : tspan[1], use_union, tofloat = false, check_length = false)
+        t = tspan === nothing ? nothing : tspan[1], tofloat = false, check_length = false)
     # identity function to make syms works
     quote
         f = DiffEqBase.DISCRETE_INPLACE_DEFAULT
@@ -475,7 +472,6 @@ end
 ```julia
 DiffEqBase.ODEProblem(sys::JumpSystem, u0map, tspan,
                            parammap = DiffEqBase.NullParameters;
-                           use_union = true,
                            kwargs...)
 ```
 
@@ -497,7 +493,6 @@ oprob = ODEProblem(complete(js), u₀map, tspan, parammap)
 """
 function DiffEqBase.ODEProblem(sys::JumpSystem, u0map, tspan::Union{Tuple, Nothing},
         parammap = DiffEqBase.NullParameters();
-        use_union = false,
         eval_expression = false,
         eval_module = @__MODULE__,
         kwargs...)
@@ -517,7 +512,7 @@ function DiffEqBase.ODEProblem(sys::JumpSystem, u0map, tspan::Union{Tuple, Nothi
             build_initializeprob = false, kwargs...)
     else
         _, u0, p = process_SciMLProblem(EmptySciMLFunction, sys, u0map, parammap;
-            t = tspan === nothing ? nothing : tspan[1], use_union, tofloat = false,
+            t = tspan === nothing ? nothing : tspan[1], tofloat = false,
             check_length = false)
         f = (du, u, p, t) -> (du .= 0; nothing)
         observedfun = ObservedFunctionCache(sys; eval_expression, eval_module,

src/systems/optimization/optimizationsystem.jl

@@ -295,7 +295,6 @@ function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem, u0map,
         cons_sparse = false, checkbounds = false,
         linenumbers = true, parallel = SerialForm(),
         eval_expression = false, eval_module = @__MODULE__,
-        use_union = false,
         checks = true,
         kwargs...) where {iip}
     if !iscomplete(sys)
@@ -338,10 +337,10 @@ function DiffEqBase.OptimizationProblem{iip}(sys::OptimizationSystem, u0map,
     elseif has_index_cache(sys) && get_index_cache(sys) !== nothing
         p = MTKParameters(sys, parammap, u0map)
     else
-        p = varmap_to_vars(parammap, ps; defaults = defs, tofloat = false, use_union)
+        p = varmap_to_vars(parammap, ps; defaults = defs, tofloat = false)
     end
-    lb = varmap_to_vars(dvs .=> lb, dvs; defaults = defs, tofloat = false, use_union)
-    ub = varmap_to_vars(dvs .=> ub, dvs; defaults = defs, tofloat = false, use_union)
+    lb = varmap_to_vars(dvs .=> lb, dvs; defaults = defs, tofloat = false)
+    ub = varmap_to_vars(dvs .=> ub, dvs; defaults = defs, tofloat = false)
 
     if !isnothing(lb) && all(lb .== -Inf) && !isnothing(ub) && all(ub .== Inf)
         lb = nothing
@@ -538,7 +537,6 @@ function OptimizationProblemExpr{iip}(sys::OptimizationSystem, u0map,
         checkbounds = false,
         linenumbers = false, parallel = SerialForm(),
         eval_expression = false, eval_module = @__MODULE__,
-        use_union = false,
         kwargs...) where {iip}
     if !iscomplete(sys)
         error("A completed `OptimizationSystem` is required. Call `complete` or `structural_simplify` on the system before creating a `OptimizationProblemExpr`")
@@ -578,10 +576,10 @@ function OptimizationProblemExpr{iip}(sys::OptimizationSystem, u0map,
     if has_index_cache(sys) && get_index_cache(sys) !== nothing
         p = MTKParameters(sys, parammap, u0map)
     else
-        p = varmap_to_vars(parammap, ps; defaults = defs, tofloat = false, use_union)
+        p = varmap_to_vars(parammap, ps; defaults = defs, tofloat = false)
     end
-    lb = varmap_to_vars(dvs .=> lb, dvs; defaults = defs, tofloat = false, use_union)
-    ub = varmap_to_vars(dvs .=> ub, dvs; defaults = defs, tofloat = false, use_union)
+    lb = varmap_to_vars(dvs .=> lb, dvs; defaults = defs, tofloat = false)
+    ub = varmap_to_vars(dvs .=> ub, dvs; defaults = defs, tofloat = false)
 
     if !isnothing(lb) && all(lb .== -Inf) && !isnothing(ub) && all(ub .== Inf)
         lb = nothing

src/systems/parameter_buffer.jl

@@ -27,7 +27,7 @@ This requires that `complete` has been called on the system (usually via
 the default behavior).
 """
 function MTKParameters(
-        sys::AbstractSystem, p, u0 = Dict(); tofloat = false, use_union = false,
+        sys::AbstractSystem, p, u0 = Dict(); tofloat = false,
         t0 = nothing, substitution_limit = 1000)
     ic = if has_index_cache(sys) && get_index_cache(sys) !== nothing
         get_index_cache(sys)

src/systems/problem_utils.jl

@@ -363,7 +363,11 @@ Keyword arguments:
 """
 function better_varmap_to_vars(varmap::AbstractDict, vars::Vector;
         tofloat = true, container_type = Array,
+<<<<<<< HEAD
         toterm = default_toterm, promotetoconcrete = nothing, check = true, allow_symbolic = false, is_initializeprob = false)
+=======
+        toterm = default_toterm, promotetoconcrete = nothing, check = true, allow_symbolic = false)
+>>>>>>> a5e1e0239a (remove instances of)
     isempty(vars) && return nothing
 
     if check
@@ -730,8 +734,12 @@ Keyword arguments:
 - `fully_determined`: Override whether the initialization system is fully determined.
 - `check_initialization_units`: Enable or disable unit checks when constructing the
   initialization problem.
+<<<<<<< HEAD
 - `tofloat`, `use_union`, `is_initializeprob`: Passed to [`better_varmap_to_vars`](@ref) for building `u0` (and
   possibly `p`).
+=======
+- `tofloat`: Passed to [`better_varmap_to_vars`](@ref) for building `u0` (and possibly `p`).
+>>>>>>> a5e1e0239a (remove instances of)
 - `u0_constructor`: A function to apply to the `u0` value returned from `better_varmap_to_vars`
   to construct the final `u0` value.
 - `du0map`: A map of derivatives to values. See `implicit_dae`.
@@ -761,7 +769,7 @@ function process_SciMLProblem(
         implicit_dae = false, t = nothing, guesses = AnyDict(),
         warn_initialize_determined = true, initialization_eqs = [],
         eval_expression = false, eval_module = @__MODULE__, fully_determined = nothing,
-        check_initialization_units = false, tofloat = true, use_union = false,
+        check_initialization_units = false, tofloat = true,
         u0_constructor = identity, du0map = nothing, check_length = true,
         symbolic_u0 = false, warn_cyclic_dependency = false,
         circular_dependency_max_cycle_length = length(all_symbols(sys)),
@@ -841,6 +849,7 @@ function process_SciMLProblem(
 
     u0 = better_varmap_to_vars(
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
         op, dvs; tofloat = true, use_union = false,
         container_type = u0Type, allow_symbolic = symbolic_u0, is_initializeprob)
@@ -851,6 +860,9 @@ function process_SciMLProblem(
 >>>>>>> 6951e652f2 (fix: don't propagate  for u0)
         container_type = u0Type, allow_symbolic = symbolic_u0)
 >>>>>>> e31ae1bcc9 (fix: propagate `tofloat`, `use_union` to `better_varmap_to_vars`)
+=======
+        op, dvs; tofloat, container_type = u0Type, allow_symbolic = symbolic_u0)
+>>>>>>> a5e1e0239a (remove instances of)
 
     if u0 !== nothing
         u0 = u0_constructor(u0)
@@ -875,7 +887,7 @@ function process_SciMLProblem(
     if is_split(sys)
         p = MTKParameters(sys, op)
     else
-        p = better_varmap_to_vars(op, ps; tofloat, use_union, container_type = pType)
+        p = better_varmap_to_vars(op, ps; tofloat, container_type = pType)
     end
 
     if implicit_dae && du0map !== nothing
@@ -944,15 +956,14 @@ end
 ##############
 
 """
-    u0, p, defs = get_u0_p(sys, u0map, parammap; use_union=true, tofloat=true)
+    u0, p, defs = get_u0_p(sys, u0map, parammap; tofloat=true)
 
 Take dictionaries with initial conditions and parameters and convert them to numeric arrays `u0` and `p`. Also return the merged dictionary `defs` containing the entire operating point.
 """
 function get_u0_p(sys,
         u0map,
         parammap = nothing;
         t0 = nothing,
-        use_union = true,
         tofloat = true,
         symbolic_u0 = false)
     dvs = unknowns(sys)
@@ -991,19 +1002,19 @@ function get_u0_p(sys,
     end
 
     if symbolic_u0
-        u0 = varmap_to_vars(u0map, dvs; defaults = defs, tofloat = false, use_union = false)
+        u0 = varmap_to_vars(u0map, dvs; defaults = defs, tofloat = false)
     else
-        u0 = varmap_to_vars(u0map, dvs; defaults = defs, tofloat = true, use_union)
+        u0 = varmap_to_vars(u0map, dvs; defaults = defs, tofloat = true)
     end
-    p = varmap_to_vars(parammap, ps; defaults = defs, tofloat, use_union)
+    p = varmap_to_vars(parammap, ps; defaults = defs, tofloat)
     p = p === nothing ? SciMLBase.NullParameters() : p
     t0 !== nothing && delete!(defs, get_iv(sys))
     u0, p, defs
 end
 
 function get_u0(
         sys, u0map, parammap = nothing; symbolic_u0 = false,
-        toterm = default_toterm, t0 = nothing, use_union = true)
+        toterm = default_toterm, t0 = nothing)
     dvs = unknowns(sys)
     ps = parameters(sys)
     defs = defaults(sys)
@@ -1026,9 +1037,9 @@ function get_u0(
     defs = mergedefaults(defs, obsmap, u0map, dvs)
     if symbolic_u0
         u0 = varmap_to_vars(
-            u0map, dvs; defaults = defs, tofloat = false, use_union = false, toterm)
+            u0map, dvs; defaults = defs, tofloat = false, toterm)
     else
-        u0 = varmap_to_vars(u0map, dvs; defaults = defs, tofloat = true, use_union, toterm)
+        u0 = varmap_to_vars(u0map, dvs; defaults = defs, tofloat = true, toterm)
     end
     t0 !== nothing && delete!(defs, get_iv(sys))
     return u0, defs

src/variables.jl

@@ -158,7 +158,7 @@ applicable.
 """
 function varmap_to_vars(varmap, varlist; defaults = Dict(), check = true,
         toterm = default_toterm, promotetoconcrete = nothing,
-        tofloat = true, use_union = true)
+        tofloat = true)
     varlist = collect(map(unwrap, varlist))
 
     # Edge cases where one of the arguments is effectively empty.
@@ -194,7 +194,7 @@ function varmap_to_vars(varmap, varlist; defaults = Dict(), check = true,
 
     promotetoconcrete === nothing && (promotetoconcrete = container_type <: AbstractArray)
     if promotetoconcrete
-        vals = promote_to_concrete(vals; tofloat = tofloat, use_union = use_union)
+        vals = promote_to_concrete(vals; tofloat = tofloat, use_union = false)
     end
 
     if isempty(vals)

test/odesystem.jl

@@ -736,7 +736,7 @@ let
 
     pmap = [k1 => 1, k2 => 1]
     tspan = (0.0, 1.0)
-    prob = ODEProblem(sys, u0map, tspan, pmap)
+    prob = ODEProblem(sys, u0map, tspan, pmap);
     @test eltype(vcat(prob.p...)) === Float64
 
     prob = ODEProblem(sys, u0map, tspan, pmap)
@@ -745,7 +745,7 @@ let
     # No longer supported, Tuple used instead
     # pmap = Pair{Any, Union{Int, Float64}}[k1 => 1, k2 => 1.0]
     # tspan = (0.0, 1.0)
-    # prob = ODEProblem(sys, u0map, tspan, pmap, use_union = true)
+    # prob = ODEProblem(sys, u0map, tspan, pmap)
     # @test eltype(prob.p) === Union{Float64, Int}
 end
 
@@ -1208,7 +1208,7 @@ end
     sys = structural_simplify(ODESystem([D(x) ~ P], t, [x], [P]; name = :sys))
 
     function x_at_1(P)
-        prob = ODEProblem(sys, [x => P], (0.0, 1.0), [sys.P => P], use_union = false)
+        prob = ODEProblem(sys, [x => P], (0.0, 1.0), [sys.P => P])
         return solve(prob, Tsit5())(1.0)
     end
 

test/split_parameters.jl

@@ -123,7 +123,7 @@ sol = solve(prob, ImplicitEuler());
 # ------------------------ Mixed Type Conserved
 
 prob = ODEProblem(
-    sys, [], tspan, []; tofloat = false, use_union = true, build_initializeprob = false)
+    sys, [], tspan, []; tofloat = false, build_initializeprob = false)
 
 @test prob.p isa Vector{Union{Float64, Int64}}
 sol = solve(prob, ImplicitEuler());