Merge branch 'master' into vk-enable-remake-for-opt-problem

Author: ChrisRackauckas

Project.toml

@@ -1,7 +1,7 @@
 name = "ModelingToolkit"
 uuid = "961ee093-0014-501f-94e3-6117800e7a78"
 authors = ["Yingbo Ma <[email protected]>", "Chris Rackauckas <[email protected]> and contributors"]
-version = "8.35.1"
+version = "8.35.2"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"

test/odesystem.jl

@@ -466,8 +466,11 @@ sys = structural_simplify(sys)
 prob = ODEProblem(sys, [], (0, 1.0))
 sol = solve(prob, Tsit5())
 @test sol[2x[1] + 3x[3] + norm(x)] ≈
-      2sol[x[1]] + 3sol[x[3]] + vec(mapslices(norm, hcat(sol[x]...), dims = 2))
-@test sol[x + [y, 2y, 3y]] ≈ sol[x] + [sol[y], 2sol[y], 3sol[y]]
+      2sol[x[1]] + 3sol[x[3]] + sol[norm(x)]
+@test sol[x .+ [y, 2y, 3y]] ≈ map((x...) -> [x...],
+          map((x, y) -> x[1] .+ y, sol[x], sol[y]),
+          map((x, y) -> x[2] .+ 2y, sol[x], sol[y]),
+          map((x, y) -> x[3] .+ 3y, sol[x], sol[y]))
 
 # Mixed Difference Differential equations
 @parameters t a b c d