Skip to content

Commit 7bcc304

Browse files
Fix downgrade bounds and dataset comparisons (#634)
Co-authored-by: ChrisRackauckas-Claude <accounts@chrisrackauckas.com>
1 parent ef9cf54 commit 7bcc304

5 files changed

Lines changed: 21 additions & 13 deletions

File tree

Project.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ version = "1.15.1"
66
[deps]
77
CommonSolve = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2"
88
DataInterpolations = "82cc6244-b520-54b8-b5a6-8a565e85f1d0"
9+
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
910
DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
1011
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
1112
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
@@ -27,7 +28,8 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
2728

2829
[compat]
2930
CommonSolve = "0.2"
30-
DataInterpolations = "4, 5, 6, 7, 8, 9.0"
31+
DataInterpolations = "8.5, 9.0"
32+
DataStructures = "0.19"
3133
DiffEqBase = "6.211, 7"
3234
DocStringExtensions = "0.7, 0.8, 0.9"
3335
LinearAlgebra = "1"

lib/DataDrivenLux/Project.toml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,18 @@ WeightInitializers = "d49dbf32-c5c2-4618-8acc-27bb2598ef2d"
3434
DataDrivenDiffEq = {path = "../.."}
3535

3636
[compat]
37-
AbstractDifferentiation = "0.6"
37+
AbstractDifferentiation = "0.6.2"
3838
ChainRulesCore = "1.15"
39-
CommonSolve = "0.2.4"
40-
ComponentArrays = "0.15"
39+
CommonSolve = "0.2.6"
40+
ComponentArrays = "0.15.40"
4141
ConcreteStructs = "0.2.3"
4242
DataDrivenDiffEq = "1.15"
43+
DataStructures = "0.19"
4344
Distributed = "1.10"
4445
Distributions = "0.25.123"
4546
DistributionsAD = "0.6"
4647
DocStringExtensions = "0.9.3"
47-
ForwardDiff = "0.10, 1"
48+
ForwardDiff = "0.10.39, 1"
4849
IntervalArithmetic = "0.22.10, 0.23, 1"
4950
InverseFunctions = "0.1"
5051
LinearAlgebra = "1.10"
@@ -53,7 +54,7 @@ Lux = "1"
5354
LuxCore = "1"
5455
Optim = "2"
5556
Optimisers = "0.3, 0.4"
56-
OrdinaryDiffEq = "6, 7"
57+
OrdinaryDiffEq = "6.111, 7"
5758
Pkg = "1.10"
5859
ProgressMeter = "1.7"
5960
Random = "1.10"
@@ -68,6 +69,7 @@ julia = "1.10"
6869

6970
[extras]
7071
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
72+
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
7173
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
7274
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
7375
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
@@ -76,4 +78,4 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
7678
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
7779

7880
[targets]
79-
test = ["Pkg", "Test", "StableRNGs", "Random", "SafeTestsets", "StatsBase", "OrdinaryDiffEq"]
81+
test = ["Pkg", "Test", "StableRNGs", "Random", "SafeTestsets", "StatsBase", "OrdinaryDiffEq", "DataStructures"]

lib/DataDrivenSR/Project.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,21 @@ DataDrivenDiffEq = {path = "../.."}
1313

1414
[compat]
1515
DataDrivenDiffEq = "1.15"
16+
DataStructures = "0.19"
1617
Pkg = "1.10"
17-
Reexport = "1.2"
18+
Reexport = "1.2.2"
1819
StableRNGs = "1"
1920
StatsBase = "0.34"
20-
SymbolicRegression = "1"
21+
SymbolicRegression = "1.13.2"
2122
Test = "1.10"
2223
julia = "1.10"
2324

2425
[extras]
26+
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
2527
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
2628
StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
2729
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
2830
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
2931

3032
[targets]
31-
test = ["Pkg", "Test", "StableRNGs", "StatsBase"]
33+
test = ["Pkg", "Test", "StableRNGs", "StatsBase", "DataStructures"]

lib/DataDrivenSparse/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ OrdinaryDiffEq = "6, 7"
1919
Pkg = "1.10"
2020
Printf = "1.10"
2121
Random = "1.10"
22-
Reexport = "1.2"
22+
Reexport = "1.2.2"
2323
SafeTestsets = "0.1"
2424
StableRNGs = "1"
2525
StatsBase = "0.34"

test/Core/problem.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,10 +156,12 @@ end
156156
@variables x[1:size(X, 1)]
157157
b = Basis(x, x)
158158
@test b(s1) == hcat(b(p1), b(p2))
159-
@test b(s2) == b(s1)
159+
# Dataset constructors can evaluate the same symbolic basis through different
160+
# call paths, which only guarantees floating-point agreement up to roundoff.
161+
@test b(s2) b(s1)
160162
@test hcat(X, X) == b(s3)
161163
@test hcat(X[:, 1:(end - 1)], X[:, 1:(end - 1)]) == b(s4)
162-
@test hcat(X, X, X) == b(s5)
164+
@test hcat(X, X, X) b(s5)
163165

164166
# Check if misspecified data is detected
165167
wrong_data = (

0 commit comments

Comments
 (0)