@@ -351,11 +351,10 @@ in `varmap`. Does not perform symbolic substitution in the values of `varmap`.
351
351
352
352
Keyword arguments:
353
353
- `tofloat`: Convert values to floating point numbers using `float`.
354
- - `use_union`: Use a `Union`-typed array if the values have heterogeneous types.
355
354
- `container_type`: The type of container to use for the values.
356
355
- `toterm`: The `toterm` method to use for converting symbolics.
357
356
- `promotetoconcrete`: whether the promote to a concrete buffer (respecting
358
- `tofloat` and `use_union` ). Defaults to `container_type <: AbstractArray`.
357
+ `tofloat`). Defaults to `container_type <: AbstractArray`.
359
358
- `check`: Error if any variables in `vars` do not have a mapping in `varmap`. Uses
360
359
[`missingvars`](@ref) to perform the check.
361
360
- `allow_symbolic` allows the returned array to contain symbolic values. If this is `true`,
@@ -393,7 +392,7 @@ function better_varmap_to_vars(varmap::AbstractDict, vars::Vector;
393
392
394
393
promotetoconcrete === nothing && (promotetoconcrete = container_type <: AbstractArray )
395
394
if promotetoconcrete && ! allow_symbolic
396
- vals = promote_to_concrete (vals; tofloat = tofloat, use_union = use_union )
395
+ vals = promote_to_concrete (vals; tofloat = tofloat, use_union = false )
397
396
end
398
397
399
398
if isempty (vals)
@@ -841,11 +840,15 @@ function process_SciMLProblem(
841
840
evaluate_varmap! (op, dvs; limit = substitution_limit)
842
841
843
842
u0 = better_varmap_to_vars (
843
+ <<<<<< < HEAD
844
844
<<<<<< < HEAD
845
845
op, dvs; tofloat = true , use_union = false ,
846
846
container_type = u0Type, allow_symbolic = symbolic_u0, is_initializeprob)
847
847
====== =
848
848
op, dvs; tofloat, use_union,
849
+ ====== =
850
+ op, dvs; tofloat, use_union = false ,
851
+ >>>>>> > 6951e652 f2 (fix: don' t propagate for u0)
849
852
container_type = u0Type, allow_symbolic = symbolic_u0)
850
853
>>>>>> > e31ae1bcc9 (fix: propagate ` tofloat` , ` use_union` to ` better_varmap_to_vars` )
851
854
0 commit comments