Skip to content

Commit 63b9e3a

Browse files
Merge branch 'JuliaSmoothOptimizers:master' into LM-JSO
2 parents de6a62b + b7646ce commit 63b9e3a

File tree

13 files changed

+874
-1254
lines changed

13 files changed

+874
-1254
lines changed

Project.toml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@ author = ["Robert Baraldi <[email protected]> and Dominique Orban <dominique.orban
44
version = "0.1.0"
55

66
[deps]
7+
Arpack = "7d9fca2a-8960-54d3-9f78-7d1dccf2cb97"
78
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
89
LinearOperators = "5c8ed15e-5a4c-59e4-a42b-c7e8811fb125"
910
Logging = "56ddb016-857b-54e1-b83d-db4d58db5568"
11+
ManualNLPModels = "30dfa513-9b2f-4fb3-9796-781eabac1617"
1012
NLPModels = "a4795742-8479-5a88-8948-cc11e1c8c1a6"
1113
NLPModelsModifiers = "e01155f1-5c6f-4375-a9d8-616dd036575f"
1214
Percival = "01435c0c-c90d-11e9-3788-63660f8fbccc"
@@ -15,18 +17,18 @@ ProximalOperators = "a725b495-10eb-56fe-b38b-717eba820537"
1517
RegularizedProblems = "ea076b23-609f-44d2-bb12-a4ae45328278"
1618
ShiftedProximalOperators = "d4fd37fa-580c-4e43-9b30-361c21aae263"
1719
SolverCore = "ff4d7338-4cf1-434d-91df-b86cb86fb843"
18-
Arpack = "7d9fca2a-8960-54d3-9f78-7d1dccf2cb97"
1920

2021
[compat]
22+
Arpack = "0.5"
2123
LinearOperators = "2.10.0"
24+
ManualNLPModels = "0.2.0"
2225
NLPModels = "0.19, 0.20, 0.21"
2326
NLPModelsModifiers = "0.7"
2427
Percival = "0.7.2"
2528
ProximalOperators = "0.15"
2629
RegularizedProblems = "0.1.1"
2730
ShiftedProximalOperators = "0.2"
2831
SolverCore = "0.3.0"
29-
Arpack = "0.5"
3032
julia = "^1.6.0"
3133

3234
[extras]

src/Fista_alg.jl

Lines changed: 0 additions & 232 deletions
This file was deleted.

0 commit comments

Comments
 (0)