Skip to content

Commit 4f8ebe0

Browse files
temp commit
1 parent e09955f commit 4f8ebe0

File tree

5 files changed

+9
-8
lines changed

5 files changed

+9
-8
lines changed

src/systems/codegen.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ function calculate_jacobian(sys::System;
125125
sparse = false, simplify = false, dvs = unknowns(sys))
126126
obs = Dict(eq.lhs => eq.rhs for eq in observed(sys))
127127
rhs = map(eq -> fixpoint_sub(eq.rhs - eq.lhs, obs), equations(sys))
128-
128+
@show rhs
129129
if sparse
130130
jac = sparsejacobian(rhs, dvs; simplify)
131131
if get_iv(sys) !== nothing

src/systems/nonlinear/homotopy_continuation.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,6 @@ function transform_system(sys::System, transformation::PolynomialTransformation;
394394
@set! sys2.unknowns = new_dvs
395395
# remove observed equations to avoid adding them in codegen
396396
@set! sys2.observed = Equation[]
397-
@set! sys2.substitutions = nothing
398397
return PolynomialTransformationResult(sys2, denoms)
399398
end
400399

src/systems/system.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ struct System <: AbstractSystem
107107
end
108108

109109
function default_consolidate(costs, subcosts)
110-
return sum(costs; init = 0.0) + sum(subcosts; init = 0.0)
110+
# `reduce` instead of `sum` because the rrule for `sum` doesn't
111+
# handle the `init` kwarg.
112+
return reduce(+, costs; init = 0.0) + reduce(+, subcosts; init = 0.0)
111113
end
112114

113115
function System(eqs::Vector{Equation}, iv, dvs, ps, brownians = [];

test/labelledarrays.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ eqs = [D(x) ~ σ * (y - x),
1313
D(z) ~ x * y - β * z]
1414

1515
@named de = System(eqs, t)
16-
de = complete(de)
17-
ff = ODEFunction(de, [x, y, z], [σ, ρ, β], jac = true)
16+
de2 = complete(de)
17+
ff = ODEFunction(de; jac = true)
1818

1919
a = @SVector [1.0, 2.0, 3.0]
2020
b = SLVector(x = 1.0, y = 2.0, z = 3.0)

test/runtests.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ end
136136

137137
if GROUP == "All" || GROUP == "Extensions"
138138
activate_extensions_env()
139-
@safetestset "Dynamic Optimization Collocation Solvers" include("extensions/dynamic_optimization.jl")
140-
@safetestset "HomotopyContinuation Extension Test" include("extensions/homotopy_continuation.jl")
141-
@safetestset "Auto Differentiation Test" include("extensions/ad.jl")
139+
# @safetestset "Dynamic Optimization Collocation Solvers" include("extensions/dynamic_optimization.jl")
140+
# @safetestset "HomotopyContinuation Extension Test" include("extensions/homotopy_continuation.jl")
141+
# @safetestset "Auto Differentiation Test" include("extensions/ad.jl")
142142
@safetestset "LabelledArrays Test" include("labelledarrays.jl")
143143
@safetestset "BifurcationKit Extension Test" include("extensions/bifurcationkit.jl")
144144
@safetestset "InfiniteOpt Extension Test" include("extensions/test_infiniteopt.jl")

0 commit comments

Comments
 (0)