Skip to content

Commit 6080323

Browse files
ErikQQYErikQQY
authored
Merge branch 'master' into qqy/simple
2 parents b66b2cd + 27c1f52 commit 6080323

File tree

13 files changed

+62
-23
lines changed

13 files changed

+62
-23
lines changed

‎Project.toml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "NonlinearSolve"
22
uuid = "8913a72c-1f9b-4ce2-8d82-65094dcecaec"
33
authors = ["SciML"]
4-
version = "4.5.0"
4+
version = "4.5.1"
55

66
[deps]
77
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
@@ -31,6 +31,14 @@ SparseMatrixColorings = "0a514795-09f3-496d-8182-132a7b665d35"
3131
StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
3232
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
3333

34+
[sources]
35+
BracketingNonlinearSolve = {path = "lib/BracketingNonlinearSolve"}
36+
NonlinearSolveBase = {path = "lib/NonlinearSolveBase"}
37+
NonlinearSolveFirstOrder = {path = "lib/NonlinearSolveFirstOrder"}
38+
NonlinearSolveQuasiNewton = {path = "lib/NonlinearSolveQuasiNewton"}
39+
NonlinearSolveSpectralMethods = {path = "lib/NonlinearSolveSpectralMethods"}
40+
SimpleNonlinearSolve = {path = "lib/SimpleNonlinearSolve"}
41+
3442
[weakdeps]
3543
FastLevenbergMarquardt = "7a0df574-e128-4d35-8cbd-3d84502bf7ce"
3644
FixedPointAcceleration = "817d07cb-a79a-5c30-9a31-890123675176"
@@ -75,7 +83,7 @@ FastClosures = "0.3.2"
7583
FastLevenbergMarquardt = "0.1"
7684
FiniteDiff = "2.24"
7785
FixedPointAcceleration = "0.3, 1"
78-
ForwardDiff = "0.10.36"
86+
ForwardDiff = "0.10.36, 1"
7987
Hwloc = "3"
8088
InteractiveUtils = "<0.0.1, 1"
8189
LeastSquaresOptim = "0.8.5"

‎docs/src/native/bracketingnonlinearsolve.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ Bisection
1818
Falsi
1919
Ridder
2020
Brent
21+
Muller
2122
```

‎docs/src/solvers/bracketing_solvers.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,14 @@ This gives a robust and fast method, which therefore enjoys considerable popular
2626

2727
## Full List of Methods
2828

29-
### SimpleNonlinearSolve.jl
29+
### BracketingNonlinearSolve.jl
3030

3131
These methods are automatically included as part of NonlinearSolve.jl. Though, one can use
32-
SimpleNonlinearSolve.jl directly to decrease the dependencies and improve load time.
32+
BracketingNonlinearSolve.jl directly to decrease the dependencies and improve load time.
3333

3434
- [`ITP`](@ref): A non-allocating ITP (Interpolate, Truncate & Project) method
3535
- [`Falsi`](@ref): A non-allocating regula falsi method
3636
- [`Bisection`](@ref): A common bisection method
3737
- [`Ridder`](@ref): A non-allocating Ridder method
3838
- [`Brent`](@ref): A non-allocating Brent method
39+
- [`Muller`](@ref): A non-allocating Muller's method

‎lib/BracketingNonlinearSolve/Project.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "BracketingNonlinearSolve"
22
uuid = "70df07ce-3d50-431d-a3e7-ca6ddb60ac1e"
33
authors = ["Avik Pal <[email protected]> and contributors"]
4-
version = "1.1.2"
4+
version = "1.1.3"
55

66
[deps]
77
CommonSolve = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2"
@@ -11,6 +11,9 @@ PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
1111
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1212
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
1313

14+
[sources]
15+
NonlinearSolveBase = {path = "../NonlinearSolveBase"}
16+
1417
[weakdeps]
1518
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
1619

@@ -22,7 +25,7 @@ Aqua = "0.8.9"
2225
CommonSolve = "0.2.4"
2326
ConcreteStructs = "0.2.3"
2427
ExplicitImports = "1.10.1"
25-
ForwardDiff = "0.10.36"
28+
ForwardDiff = "0.10.36, 1"
2629
InteractiveUtils = "<0.0.1, 1"
2730
NonlinearSolveBase = "1.1"
2831
PrecompileTools = "1.2"

‎lib/BracketingNonlinearSolve/src/muller.jl

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
"""
22
Muller(; middle = nothing)
33
4-
Muller's method for determining a root of a univariate, scalar function. The
5-
algorithm, described in Sec. 9.5.2 of
6-
[Press et al. (2007)](https://numerical.recipes/book.html), requires three
7-
initial guesses `(left, middle, right)` for the root.
4+
Muller's method for determining a root of a univariate, scalar function.
5+
6+
The algorithm, described in Sec. 9.5.2 of
7+
[Press et al. (2007)](https://numerical.recipes/book.html), is a generalization
8+
of the secant method, using quadratic interpolation of three points to find the
9+
next estimate for the root. Due to the quadratic interpolation, the method is
10+
well suited for obtaining complex roots.
11+
12+
This method requires three initial guesses `(left, middle, right)` for the
13+
solution. The guesses `(left, right) = tspan` are provided by the
14+
`IntervalNonlinearProblem`, while the `middle` guess may be specified as an
15+
optional keyword argument. In notable contrast to the other
16+
`BracketingNonlinearSolve.jl` solvers, the `Muller` algorithm does not need
17+
`(left, right)` to bracket the root.
818
919
### Keyword Arguments
1020

‎lib/NonlinearSolveBase/Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "NonlinearSolveBase"
22
uuid = "be0214bd-f91f-a760-ac4e-3421ce2b2da0"
33
authors = ["Avik Pal <[email protected]> and contributors"]
4-
version = "1.5.1"
4+
version = "1.5.2"
55

66
[deps]
77
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
@@ -58,7 +58,7 @@ DifferentiationInterface = "0.6.16"
5858
EnzymeCore = "0.8"
5959
ExplicitImports = "1.10.1"
6060
FastClosures = "0.3"
61-
ForwardDiff = "0.10.36"
61+
ForwardDiff = "0.10.36, 1"
6262
InteractiveUtils = "<0.0.1, 1"
6363
LineSearch = "0.1.4"
6464
LinearAlgebra = "1.10"

‎lib/NonlinearSolveFirstOrder/Project.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "NonlinearSolveFirstOrder"
22
uuid = "5959db7a-ea39-4486-b5fe-2dd0bf03d60d"
33
authors = ["Avik Pal <[email protected]> and contributors"]
4-
version = "1.3.0"
4+
version = "1.3.1"
55

66
[deps]
77
ADTypes = "47edcb42-4c32-4615-8424-f2b9edc5f35b"
@@ -23,6 +23,9 @@ SciMLJacobianOperators = "19f34311-ddf3-4b8b-af20-060888a46c0e"
2323
Setfield = "efcf1570-3423-57d1-acb7-fd33fddbac46"
2424
StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
2525

26+
[sources]
27+
NonlinearSolveBase = {path = "../NonlinearSolveBase"}
28+
2629
[compat]
2730
ADTypes = "1.9.0"
2831
Aqua = "0.8"
@@ -35,7 +38,7 @@ DiffEqBase = "6.158.3"
3538
Enzyme = "0.13.12"
3639
ExplicitImports = "1.5"
3740
FiniteDiff = "2.24"
38-
ForwardDiff = "0.10.36"
41+
ForwardDiff = "0.10.36, 1"
3942
Hwloc = "3"
4043
InteractiveUtils = "<0.0.1, 1"
4144
LineSearch = "0.1.4"

‎lib/NonlinearSolveHomotopyContinuation/Project.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
1616
SymbolicIndexingInterface = "2efcf032-c050-4f8e-a9bb-153293bab1f5"
1717
TaylorDiff = "b36ab563-344f-407b-a36a-4f200bebf99c"
1818

19+
[sources]
20+
NonlinearSolveBase = {path = "../NonlinearSolveBase"}
21+
1922
[compat]
2023
ADTypes = "1.11.0"
2124
Aqua = "0.8"

‎lib/NonlinearSolveQuasiNewton/Project.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "NonlinearSolveQuasiNewton"
22
uuid = "9a2c21bd-3a47-402d-9113-8faf9a0ee114"
33
authors = ["Avik Pal <[email protected]> and contributors"]
4-
version = "1.2.0"
4+
version = "1.2.1"
55

66
[deps]
77
ArrayInterface = "4fba245c-0d91-5ea0-9b3e-6abc04ee57a9"
@@ -18,6 +18,9 @@ SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
1818
SciMLOperators = "c0aeaf25-5076-4817-a8d5-81caf7dfa961"
1919
StaticArraysCore = "1e83bf80-4336-4d27-bf5d-d5a4f845583c"
2020

21+
[sources]
22+
NonlinearSolveBase = {path = "../NonlinearSolveBase"}
23+
2124
[weakdeps]
2225
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
2326

@@ -35,7 +38,7 @@ DiffEqBase = "6.158.3"
3538
Enzyme = "0.13.12"
3639
ExplicitImports = "1.5"
3740
FiniteDiff = "2.24"
38-
ForwardDiff = "0.10.36"
41+
ForwardDiff = "0.10.36, 1"
3942
Hwloc = "3"
4043
InteractiveUtils = "<0.0.1, 1"
4144
LineSearch = "0.1.4"

‎lib/NonlinearSolveSpectralMethods/Project.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "NonlinearSolveSpectralMethods"
22
uuid = "26075421-4e9a-44e1-8bd1-420ed7ad02b2"
33
authors = ["Avik Pal <[email protected]> and contributors"]
4-
version = "1.1.0"
4+
version = "1.1.1"
55

66
[deps]
77
CommonSolve = "38540f10-b2f7-11e9-35d8-d573e4eb0ff2"
@@ -14,6 +14,9 @@ PrecompileTools = "aea7be01-6a6a-4083-8856-8a6e6704d82a"
1414
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
1515
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
1616

17+
[sources]
18+
NonlinearSolveBase = {path = "../NonlinearSolveBase"}
19+
1720
[weakdeps]
1821
ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
1922

@@ -27,7 +30,7 @@ CommonSolve = "0.2.4"
2730
ConcreteStructs = "0.2.3"
2831
DiffEqBase = "6.158.3"
2932
ExplicitImports = "1.5"
30-
ForwardDiff = "0.10.36"
33+
ForwardDiff = "0.10.36, 1"
3134
Hwloc = "3"
3235
InteractiveUtils = "<0.0.1, 1"
3336
LineSearch = "0.1.4"

0 commit comments

Comments
 (0)