Skip to content

Commit 00e31b9

Browse files
authored
Adjust Combat Bounds (#419)
* Add compat bounds * Add implicit dependencies * Adjust compat bounds * Reimport solve! * Add StatsBase * Add StatsBase and remove Reexport * Format * Add docs compat
1 parent 11b21b2 commit 00e31b9

File tree

8 files changed

+37
-31
lines changed

8 files changed

+37
-31
lines changed

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ DiffEqBase = "2b5f629d-d688-5b77-993f-72d75c75574e"
1010
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
1111
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
1212
MLUtils = "f1d291b0-491e-4a28-83b9-f70985020b54"
13-
Measurements = "eff96d63-e80a-5855-80a2-b1b0885c5ab7"
1413
ModelingToolkit = "961ee093-0014-501f-94e3-6117800e7a78"
1514
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
1615
ProgressMeter = "92933f4c-e287-5a05-a399-4b506db050ca"
@@ -29,6 +28,7 @@ DataInterpolations = "3.7"
2928
DiffEqBase = "6"
3029
DocStringExtensions = "0.7, 0.8, 0.9"
3130
ModelingToolkit = "7, 8"
31+
MLUtils = "0.3"
3232
Parameters = "0.12"
3333
ProgressMeter = "1.6"
3434
QuadGK = "2.4"

docs/Project.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,10 @@ StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
1111

1212
[compat]
1313
Documenter = "0.27"
14+
DataDrivenDiffEq = "1"
15+
ModelingToolkit = "8"
16+
OrdinaryDiffEq = "6"
17+
StatsBase = "0.33"
18+
Literate = "2.14"
19+
StableRNGs = "1"
20+
Plots = "1"

lib/DataDrivenDMD/Project.toml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@ authors = ["JuliusMartensen <[email protected]>"]
44
version = "0.1.0"
55

66
[deps]
7-
CommonSolve = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2"
87
DataDrivenDiffEq = "2445eb08-9709-466a-b3fc-47e12bd697a2"
9-
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
108
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
11-
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
12-
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
139

1410
[compat]
11+
DataDrivenDiffEq = "1"
1512
julia = "1.6"
1613

1714
[extras]
1815
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"
1916
SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
2017
StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
18+
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
2119
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
2220

2321
[targets]
24-
test = ["Test", "OrdinaryDiffEq", "StableRNGs", "SafeTestsets"]
22+
test = ["Test", "OrdinaryDiffEq", "StableRNGs", "StatsBase", "SafeTestsets"]

lib/DataDrivenDMD/src/DataDrivenDMD.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module DataDrivenDMD
22

3-
using CommonSolve: solve!
43
using DataDrivenDiffEq
54
# Load specific (abstract) types
65
using DataDrivenDiffEq: AbstractBasis
@@ -11,12 +10,13 @@ using DataDrivenDiffEq: DDReturnCode, ABSTRACT_CONT_PROB, ABSTRACT_DISCRETE_PROB
1110
using DataDrivenDiffEq: InternalDataDrivenProblem
1211
using DataDrivenDiffEq: is_implicit, is_controlled
1312

14-
using DocStringExtensions
13+
using DataDrivenDiffEq.DocStringExtensions
14+
using DataDrivenDiffEq.CommonSolve
15+
using DataDrivenDiffEq.CommonSolve: solve!
16+
using DataDrivenDiffEq.StatsBase
17+
using DataDrivenDiffEq.Parameters
1518

1619
using LinearAlgebra
17-
using CommonSolve
18-
using StatsBase
19-
using Parameters
2020

2121
abstract type AbstractKoopmanAlgorithm <: AbstractDataDrivenAlgorithm end
2222

lib/DataDrivenSR/Project.toml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@ authors = ["JuliusMartensen <[email protected]>"]
44
version = "0.1.0"
55

66
[deps]
7-
CommonSolve = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2"
87
DataDrivenDiffEq = "2445eb08-9709-466a-b3fc-47e12bd697a2"
9-
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
10-
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
118
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
12-
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
139
SymbolicRegression = "8254be44-1295-4e6a-a16d-46603ac705cb"
1410

1511
[compat]
12+
Reexport = "1.2"
13+
DataDrivenDiffEq = "1"
14+
SymbolicRegression = "0.14"
1615
julia = "1.6"
1716

1817
[extras]
1918
StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
19+
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
2020
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
2121

2222
[targets]
23-
test = ["Test", "StableRNGs"]
23+
test = ["Test", "StableRNGs", "StatsBase"]

lib/DataDrivenSR/src/DataDrivenSR.jl

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
module DataDrivenSR
22

3-
using CommonSolve: solve!
43
using DataDrivenDiffEq
54
# Load specific (abstract) types
65
using DataDrivenDiffEq: AbstractBasis
@@ -11,15 +10,15 @@ using DataDrivenDiffEq: DDReturnCode, ABSTRACT_CONT_PROB, ABSTRACT_DISCRETE_PROB
1110
using DataDrivenDiffEq: InternalDataDrivenProblem
1211
using DataDrivenDiffEq: is_implicit, is_controlled
1312

14-
using DocStringExtensions
13+
using DataDrivenDiffEq.DocStringExtensions
14+
using DataDrivenDiffEq.CommonSolve
15+
using DataDrivenDiffEq.CommonSolve: solve!
16+
using DataDrivenDiffEq.StatsBase
17+
using DataDrivenDiffEq.Parameters
1518

1619
using Reexport
17-
using CommonSolve
18-
using StatsBase
19-
using Parameters
2020

2121
@reexport using SymbolicRegression
22-
2322
"""
2423
$(TYPEDEF)
2524
Options for using SymbolicRegression.jl within the `solve` function.

lib/DataDrivenSparse/Project.toml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@ version = "0.1.0"
66
[deps]
77
CommonSolve = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2"
88
DataDrivenDiffEq = "2445eb08-9709-466a-b3fc-47e12bd697a2"
9-
DocStringExtensions = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
109
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
11-
Parameters = "d96e819e-fc66-5662-9728-84c9c7592b0a"
1210
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
1311
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
14-
Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
15-
StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
12+
13+
14+
[compat]
15+
julia = "1.6"
16+
DataDrivenDiffEq = "1"
17+
Reexport = "1.2"
1618

1719
[extras]
1820
OrdinaryDiffEq = "1dea7af3-3e70-54e6-95c3-0bf5283fa5ed"

lib/DataDrivenSparse/src/DataDrivenSparse.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ using DataDrivenDiffEq: DDReturnCode, ABSTRACT_CONT_PROB, ABSTRACT_DISCRETE_PROB
1212
using DataDrivenDiffEq: InternalDataDrivenProblem
1313
using DataDrivenDiffEq: is_implicit, is_controlled
1414

15-
using DocStringExtensions
15+
using DataDrivenDiffEq.DocStringExtensions
16+
using DataDrivenDiffEq.CommonSolve
17+
using DataDrivenDiffEq.StatsBase
18+
using DataDrivenDiffEq.Parameters
19+
using DataDrivenDiffEq.Setfield
1620

1721
using Reexport
18-
using CommonSolve
19-
using StatsBase
20-
using Parameters
21-
using Setfield
2222
using LinearAlgebra
2323
using Printf
2424

0 commit comments

Comments
 (0)