diff --git a/Manifest.toml b/Manifest.toml index 4c1271f..a87c1ef 100644 --- a/Manifest.toml +++ b/Manifest.toml @@ -107,9 +107,9 @@ version = "0.4.0" [[deps.ArrayInterface]] deps = ["Adapt", "LinearAlgebra"] -git-tree-sha1 = "d60a1922358aa203019b7857a2c8c37329b8736c" +git-tree-sha1 = "d5140b60b87473df18cf4fe66382b7c3596df047" uuid = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9" -version = "7.17.0" +version = "7.17.1" [deps.ArrayInterface.extensions] ArrayInterfaceBandedMatricesExt = "BandedMatrices" @@ -213,9 +213,9 @@ version = "1.1.0" [[deps.ChainRules]] deps = ["Adapt", "ChainRulesCore", "Compat", "Distributed", "GPUArraysCore", "IrrationalConstants", "LinearAlgebra", "Random", "RealDot", "SparseArrays", "SparseInverseSubset", "Statistics", "StructArrays", "SuiteSparse"] -git-tree-sha1 = "9e2503a7ac8df599cbf422af95729b2d263220f6" +git-tree-sha1 = "bcffdcaed50d3453673b852f3522404a94b50fad" uuid = "082447d4-558c-5d27-93f4-14fc19e9eca2" -version = "1.72.0" +version = "1.72.1" [[deps.ChainRulesCore]] deps = ["Compat", "LinearAlgebra"] @@ -438,9 +438,9 @@ version = "6.160.0" [[deps.DiffEqCallbacks]] deps = ["ConcreteStructs", "DataStructures", "DiffEqBase", "DifferentiationInterface", "Functors", "LinearAlgebra", "Markdown", "RecipesBase", "RecursiveArrayTools", "SciMLBase", "StaticArraysCore"] -git-tree-sha1 = "5458b607a6639b0e9c587d5afffc5d41a8f9cfb7" +git-tree-sha1 = "0b99b7d5b938a3f09b1552c304ff70e8d0379efd" uuid = "459566f4-90b8-5000-8ac3-15dfb0a30def" -version = "4.2.0" +version = "4.2.1" [[deps.DiffEqNoiseProcess]] deps = ["DiffEqBase", "Distributions", "GPUArraysCore", "LinearAlgebra", "Markdown", "Optim", "PoissonRandom", "QuadGK", "Random", "Random123", "RandomNumbers", "RecipesBase", "RecursiveArrayTools", "ResettableStacks", "SciMLBase", "StaticArraysCore", "Statistics"] @@ -1221,9 +1221,9 @@ version = "0.5.7" [[deps.MutableArithmetics]] deps = ["LinearAlgebra", "SparseArrays", "Test"] -git-tree-sha1 = "90077f1e79de8c9c7c8a90644494411111f4e07b" +git-tree-sha1 = "a2710df6b0931f987530f59427441b21245d8f5e" uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0" -version = "1.5.2" +version = "1.6.0" [[deps.NLSolversBase]] deps = ["DiffResults", "Distributed", "FiniteDiff", "ForwardDiff"] @@ -1351,9 +1351,9 @@ version = "1.1.2" [[deps.OrdinaryDiffEqCore]] deps = ["ADTypes", "Accessors", "Adapt", "ArrayInterface", "DataStructures", "DiffEqBase", "DocStringExtensions", "EnumX", "FastBroadcast", "FastClosures", "FastPower", "FillArrays", "FunctionWrappersWrappers", "InteractiveUtils", "LinearAlgebra", "Logging", "MacroTools", "MuladdMacro", "Polyester", "PrecompileTools", "Preferences", "RecursiveArrayTools", "Reexport", "SciMLBase", "SciMLOperators", "SciMLStructures", "SimpleUnPack", "Static", "StaticArrayInterface", "StaticArraysCore", "SymbolicIndexingInterface", "TruncatedStacktraces"] -git-tree-sha1 = "6f86041d5978ce3574f022f4098e0c216e2a3395" +git-tree-sha1 = "c738f18c561f369115a30c5c25a51f3a61a437b5" uuid = "bbf590c4-e513-4bbe-9b18-05decba2e5d8" -version = "1.10.2" +version = "1.11.0" weakdeps = ["EnzymeCore"] [deps.OrdinaryDiffEqCore.extensions] @@ -1429,10 +1429,10 @@ uuid = "1d0040c9-8b98-4ee7-8388-3f51789ca0ad" version = "0.2.2" [[deps.Polynomials]] -deps = ["LinearAlgebra", "RecipesBase", "Requires", "Setfield", "SparseArrays"] -git-tree-sha1 = "1a9cfb2dc2c2f1bd63f1906d72af39a79b49b736" +deps = ["LinearAlgebra", "OrderedCollections", "RecipesBase", "Requires", "Setfield", "SparseArrays"] +git-tree-sha1 = "adc25dbd4d13f148f3256b6d4743fe7e63a71c4a" uuid = "f27b6e38-b328-58d1-80ce-0feddd5e7a45" -version = "4.0.11" +version = "4.0.12" [deps.Polynomials.extensions] PolynomialsChainRulesCoreExt = "ChainRulesCore" @@ -1663,9 +1663,9 @@ version = "0.1.0" [[deps.SciMLBase]] deps = ["ADTypes", "Accessors", "ArrayInterface", "CommonSolve", "ConstructionBase", "Distributed", "DocStringExtensions", "EnumX", "Expronicon", "FunctionWrappersWrappers", "IteratorInterfaceExtensions", "LinearAlgebra", "Logging", "Markdown", "PrecompileTools", "Preferences", "Printf", "RecipesBase", "RecursiveArrayTools", "Reexport", "RuntimeGeneratedFunctions", "SciMLOperators", "SciMLStructures", "StaticArraysCore", "Statistics", "SymbolicIndexingInterface"] -git-tree-sha1 = "cacc7bc54bab8749b1fc1032c4911fe80cffb959" +git-tree-sha1 = "57db8ea2a39fc25c11f44d46c52b7a8d110f5324" uuid = "0bca4576-84f4-4d90-8ffe-ffa030f20462" -version = "2.61.0" +version = "2.62.0" [deps.SciMLBase.extensions] SciMLBaseChainRulesCoreExt = "ChainRulesCore" @@ -1713,9 +1713,9 @@ version = "7.71.1" [[deps.SciMLStructures]] deps = ["ArrayInterface"] -git-tree-sha1 = "25514a6f200219cd1073e4ff23a6324e4a7efe64" +git-tree-sha1 = "4cce08f7f8f9501edb1ea7b15360529745580e96" uuid = "53ae85a6-f571-4167-b2af-e1d143709226" -version = "1.5.0" +version = "1.6.0" [[deps.Serialization]] uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b" @@ -2002,9 +2002,9 @@ version = "3.7.2" [[deps.Symbolics]] deps = ["ADTypes", "ArrayInterface", "Bijections", "CommonWorldInvalidations", "ConstructionBase", "DataStructures", "DiffRules", "Distributions", "DocStringExtensions", "DomainSets", "DynamicPolynomials", "IfElse", "LaTeXStrings", "Latexify", "Libdl", "LinearAlgebra", "LogExpFunctions", "MacroTools", "Markdown", "NaNMath", "PrecompileTools", "Primes", "RecipesBase", "Reexport", "RuntimeGeneratedFunctions", "SciMLBase", "Setfield", "SparseArrays", "SpecialFunctions", "StaticArraysCore", "SymbolicIndexingInterface", "SymbolicLimits", "SymbolicUtils", "TermInterface"] -git-tree-sha1 = "2f8e9bb64b0a1d658fcf4f3c7bc145284ad0f69b" +git-tree-sha1 = "d5c0ea92aa7b14b0ffca575e07af48ecb9e83f7b" uuid = "0c5d862f-8b57-4792-8d23-62f2024744c7" -version = "6.20.0" +version = "6.21.0" [deps.Symbolics.extensions] SymbolicsForwardDiffExt = "ForwardDiff" diff --git a/test/ddt.jl b/test/ddt.jl index cec5278..c9a9a5f 100644 --- a/test/ddt.jl +++ b/test/ddt.jl @@ -29,7 +29,8 @@ let sys = IRODESystem(ddt_nonlinear; debug_config=(; store_ss_levels=true)) for sol in solve_dae(sys, [0.], [1.], (0., 1.); reltol=1e-6) @test all(isapprox.(sol[sys.x], exp.(sol.t), atol=1e-4)) - @test all(isapprox.(sol[sys.y], exp.(sol.t), atol=1e-4)) + #DAECompiler incorrectly tries to interpolate based on algebraic vars + @test_broken all(isapprox.(sol[sys.y], exp.(sol.t), atol=1e-4)) end for level in dbg.ss_levels @@ -50,8 +51,11 @@ end let sys = IRODESystem(ddt_nonlinear2; debug_config=(; store_ss_levels=true)) dbg = getfield(sys, :debug_config) - for sol in (solve_dae(sys, [0., 0.], [1., 1.], (0., 1.))..., - solve_ode(sys, [1., 1., 0., 0.], (0., 1.))..., ) + for sol in solve_dae(sys, [0., 0.], [1., 1.], (0., 1.)) + @test all(isapprox.(sol[sys.x], exp.(sol.t), atol=1e-2)) + @test all(isapprox.(sol[sys.y], exp.(sol.t), atol=1e-2)) + end + for sol in solve_ode(sys, [1., 1., 0., 0.], (0., 1.)) @test all(isapprox.(sol[sys.x], exp.(sol.t), atol=1e-2)) @test all(isapprox.(sol[sys.y], exp.(sol.t), atol=1e-2)) end diff --git a/test/implied_alias.jl b/test/implied_alias.jl index 84a11e0..baad579 100644 --- a/test/implied_alias.jl +++ b/test/implied_alias.jl @@ -4,7 +4,6 @@ using Test using SciMLBase using DAECompiler using DAECompiler.Intrinsics -using OrdinaryDiffEq include("testutils.jl") diff --git a/test/regression.jl b/test/regression.jl index e2649e3..bd4f876 100644 --- a/test/regression.jl +++ b/test/regression.jl @@ -371,6 +371,7 @@ function (p::OneParam)() equation!(state_ddt(state_ddt(y)) - z*ẍ) equation!(x - ẍ) end +using Sundails let sys = IRODESystem(Tuple{OneParam}; debug_config=(;store_ir_levels=true, store_ss_levels=true)); daeprob = DAEProblem(sys, [0., 0., 0.], [1., 0., 1.], (0., 1.), OneParam(1.)); sol = solve(daeprob, IDA())