diff --git a/Project.toml b/Project.toml index 246ae7cd..1d1810f2 100644 --- a/Project.toml +++ b/Project.toml @@ -6,6 +6,7 @@ version = "1.15.1" [deps] CommonSolve = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2" DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0" +DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e" DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae" LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e" @@ -27,7 +28,8 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7" [compat] CommonSolve = "0.2" -DataInterpolations = "4, 5, 6, 7, 8, 9.0" +DataInterpolations = "8.5, 9.0" +DataStructures = "0.19" DiffEqBase = "6.211, 7" DocStringExtensions = "0.7, 0.8, 0.9" LinearAlgebra = "1" diff --git a/lib/DataDrivenLux/Project.toml b/lib/DataDrivenLux/Project.toml index 6816c8c5..b4972ec1 100644 --- a/lib/DataDrivenLux/Project.toml +++ b/lib/DataDrivenLux/Project.toml @@ -34,17 +34,18 @@ WeightInitializers = "d49dbf32-c5c2-4618-8acc-27bb2598ef2d" DataDrivenDiffEq = {path = "../.."} [compat] -AbstractDifferentiation = "0.6" +AbstractDifferentiation = "0.6.2" ChainRulesCore = "1.15" -CommonSolve = "0.2.4" -ComponentArrays = "0.15" +CommonSolve = "0.2.6" +ComponentArrays = "0.15.40" ConcreteStructs = "0.2.3" DataDrivenDiffEq = "1.15" +DataStructures = "0.19" Distributed = "1.10" Distributions = "0.25.123" DistributionsAD = "0.6" DocStringExtensions = "0.9.3" -ForwardDiff = "0.10, 1" +ForwardDiff = "0.10.39, 1" IntervalArithmetic = "0.22.10, 0.23, 1" InverseFunctions = "0.1" LinearAlgebra = "1.10" @@ -53,7 +54,7 @@ Lux = "1" LuxCore = "1" Optim = "2" Optimisers = "0.3, 0.4" -OrdinaryDiffEq = "6, 7" +OrdinaryDiffEq = "6.111, 7" Pkg = "1.10" ProgressMeter = "1.7" Random = "1.10" @@ -68,6 +69,7 @@ julia = "1.10" [extras] OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed" +DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c" SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f" @@ -76,4 +78,4 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Pkg", "Test", "StableRNGs", "Random", "SafeTestsets", "StatsBase", "OrdinaryDiffEq"] +test = ["Pkg", "Test", "StableRNGs", "Random", "SafeTestsets", "StatsBase", "OrdinaryDiffEq", "DataStructures"] diff --git a/lib/DataDrivenSR/Project.toml b/lib/DataDrivenSR/Project.toml index 37c74489..c2497337 100644 --- a/lib/DataDrivenSR/Project.toml +++ b/lib/DataDrivenSR/Project.toml @@ -13,19 +13,21 @@ DataDrivenDiffEq = {path = "../.."} [compat] DataDrivenDiffEq = "1.15" +DataStructures = "0.19" Pkg = "1.10" -Reexport = "1.2" +Reexport = "1.2.2" StableRNGs = "1" StatsBase = "0.34" -SymbolicRegression = "1" +SymbolicRegression = "1.13.2" Test = "1.10" julia = "1.10" [extras] +DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8" Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f" StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3" StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91" Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40" [targets] -test = ["Pkg", "Test", "StableRNGs", "StatsBase"] +test = ["Pkg", "Test", "StableRNGs", "StatsBase", "DataStructures"] diff --git a/lib/DataDrivenSparse/Project.toml b/lib/DataDrivenSparse/Project.toml index bdf887fb..7e209a1c 100644 --- a/lib/DataDrivenSparse/Project.toml +++ b/lib/DataDrivenSparse/Project.toml @@ -19,7 +19,7 @@ OrdinaryDiffEq = "6, 7" Pkg = "1.10" Printf = "1.10" Random = "1.10" -Reexport = "1.2" +Reexport = "1.2.2" SafeTestsets = "0.1" StableRNGs = "1" StatsBase = "0.34" diff --git a/test/Core/problem.jl b/test/Core/problem.jl index b9e3d0da..2023fa70 100644 --- a/test/Core/problem.jl +++ b/test/Core/problem.jl @@ -156,10 +156,12 @@ end @variables x[1:size(X, 1)] b = Basis(x, x) @test b(s1) == hcat(b(p1), b(p2)) - @test b(s2) == b(s1) + # Dataset constructors can evaluate the same symbolic basis through different + # call paths, which only guarantees floating-point agreement up to roundoff. + @test b(s2) ≈ b(s1) @test hcat(X, X) == b(s3) @test hcat(X[:, 1:(end - 1)], X[:, 1:(end - 1)]) == b(s4) - @test hcat(X, X, X) == b(s5) + @test hcat(X, X, X) ≈ b(s5) # Check if misspecified data is detected wrong_data = (