From f10e8d20a793f117ef04561cd05e701f997c2bee Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Sun, 21 Jul 2024 18:44:52 -0400 Subject: [PATCH 1/4] Pass down documented kwargs in structural_simplifiy I didn't let the tests run because I thought it was a harmless doc change, I missed that these kwargs were pulled out. But at least the failure wasn't released. --- src/systems/systems.jl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/systems/systems.jl b/src/systems/systems.jl index 2ac0c3d5d7..fd392b696b 100644 --- a/src/systems/systems.jl +++ b/src/systems/systems.jl @@ -21,7 +21,9 @@ function structural_simplify( sys::AbstractSystem, io = nothing; simplify = false, split = true, allow_symbolic = true, allow_parameter = true, conservative = false, fully_determined = true, kwargs...) - newsys′ = __structural_simplify(sys, io; simplify, kwargs...) + newsys′ = __structural_simplify(sys, io; simplify, + allow_symbolic = true, allow_parameter = true, conservative = false, fully_determined = true, + kwargs...) if newsys′ isa Tuple @assert length(newsys′) == 2 newsys = newsys′[1] From dea63053d2071480d90d4825d633e5ae40cee71d Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Sun, 21 Jul 2024 18:50:25 -0400 Subject: [PATCH 2/4] format --- src/systems/systems.jl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/systems/systems.jl b/src/systems/systems.jl index fd392b696b..263587fc98 100644 --- a/src/systems/systems.jl +++ b/src/systems/systems.jl @@ -21,9 +21,9 @@ function structural_simplify( sys::AbstractSystem, io = nothing; simplify = false, split = true, allow_symbolic = true, allow_parameter = true, conservative = false, fully_determined = true, kwargs...) - newsys′ = __structural_simplify(sys, io; simplify, - allow_symbolic = true, allow_parameter = true, conservative = false, fully_determined = true, - kwargs...) + newsys′ = __structural_simplify(sys, io; simplify, + allow_symbolic = true, allow_parameter = true, conservative = false, fully_determined = true, + kwargs...) if newsys′ isa Tuple @assert length(newsys′) == 2 newsys = newsys′[1] From e9a6577bdc05d2a296086a7357d7af608c0f8daf Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Sun, 21 Jul 2024 20:18:32 -0400 Subject: [PATCH 3/4] Update systems.jl --- src/systems/systems.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/systems/systems.jl b/src/systems/systems.jl index 263587fc98..3f52670ae8 100644 --- a/src/systems/systems.jl +++ b/src/systems/systems.jl @@ -22,7 +22,7 @@ function structural_simplify( allow_symbolic = true, allow_parameter = true, conservative = false, fully_determined = true, kwargs...) newsys′ = __structural_simplify(sys, io; simplify, - allow_symbolic = true, allow_parameter = true, conservative = false, fully_determined = true, + allow_symbolic, allow_parameter, conservative, fully_determined, kwargs...) if newsys′ isa Tuple @assert length(newsys′) == 2 From add2999419a741ac7931b808ba5738cb4f8e80ca Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Sun, 21 Jul 2024 20:49:42 -0400 Subject: [PATCH 4/4] fix allow_symbolic default --- src/systems/systems.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/systems/systems.jl b/src/systems/systems.jl index 3f52670ae8..29f7c7b94f 100644 --- a/src/systems/systems.jl +++ b/src/systems/systems.jl @@ -19,7 +19,7 @@ topological sort of the observed equations in `sys`. """ function structural_simplify( sys::AbstractSystem, io = nothing; simplify = false, split = true, - allow_symbolic = true, allow_parameter = true, conservative = false, fully_determined = true, + allow_symbolic = false, allow_parameter = true, conservative = false, fully_determined = true, kwargs...) newsys′ = __structural_simplify(sys, io; simplify, allow_symbolic, allow_parameter, conservative, fully_determined,