Skip to content

Commit 24e9a26

Browse files
blegatblegat
authored
Merge pull request #25 from cynddl/master
Update requirements for JuMP 0.20 and StructJuMP#master
2 parents ac3b1d0 + 1299605 commit 24e9a26

File tree

3 files changed

+352
-2
lines changed

3 files changed

+352
-2
lines changed

‎Manifest.toml

Lines changed: 327 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,327 @@
1+
[[ArnoldiMethod]]
2+
deps = ["DelimitedFiles", "LinearAlgebra", "Random", "SparseArrays", "StaticArrays", "Test"]
3+
git-tree-sha1 = "2b6845cea546604fb4dca4e31414a6a59d39ddcd"
4+
uuid = "ec485272-7323-5ecc-a04f-4719b315124d"
5+
version = "0.0.4"
6+
7+
[[Base64]]
8+
uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
9+
10+
[[BenchmarkTools]]
11+
deps = ["JSON", "Printf", "Statistics"]
12+
git-tree-sha1 = "90b73db83791c5f83155016dd1cc1f684d4e1361"
13+
uuid = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
14+
version = "0.4.3"
15+
16+
[[BinDeps]]
17+
deps = ["Libdl", "Pkg", "SHA", "URIParser", "Unicode"]
18+
git-tree-sha1 = "66158ad56b4bf6cc8413b37d0b7bc52402682764"
19+
uuid = "9e28174c-4ba2-5203-b857-d8d62c4213ee"
20+
version = "1.0.0"
21+
22+
[[BinaryProvider]]
23+
deps = ["Libdl", "SHA"]
24+
git-tree-sha1 = "5b08ed6036d9d3f0ee6369410b830f8873d4024c"
25+
uuid = "b99e7846-7c00-51b0-8f62-c81ae34c0232"
26+
version = "0.5.8"
27+
28+
[[Calculus]]
29+
deps = ["LinearAlgebra"]
30+
git-tree-sha1 = "f641eb0a4f00c343bbc32346e1217b86f3ce9dad"
31+
uuid = "49dc2e85-a5d0-5ad3-a950-438e2897f1b9"
32+
version = "0.5.1"
33+
34+
[[CodecBzip2]]
35+
deps = ["BinaryProvider", "Libdl", "TranscodingStreams"]
36+
git-tree-sha1 = "5db086e510c11b4c87d05067627eadb2dc079995"
37+
uuid = "523fee87-0ab8-5b00-afb7-3ecf72e48cfd"
38+
version = "0.6.0"
39+
40+
[[CodecZlib]]
41+
deps = ["BinaryProvider", "Libdl", "TranscodingStreams"]
42+
git-tree-sha1 = "05916673a2627dd91b4969ff8ba6941bc85a960e"
43+
uuid = "944b1d66-785c-5afd-91f1-9de20f533193"
44+
version = "0.6.0"
45+
46+
[[CommonSubexpressions]]
47+
deps = ["Test"]
48+
git-tree-sha1 = "efdaf19ab11c7889334ca247ff4c9f7c322817b0"
49+
uuid = "bbf7d656-a473-5ed7-a52c-81e309532950"
50+
version = "0.2.0"
51+
52+
[[Compat]]
53+
deps = ["Base64", "Dates", "DelimitedFiles", "Distributed", "InteractiveUtils", "LibGit2", "Libdl", "LinearAlgebra", "Markdown", "Mmap", "Pkg", "Printf", "REPL", "Random", "Serialization", "SharedArrays", "Sockets", "SparseArrays", "Statistics", "Test", "UUIDs", "Unicode"]
54+
git-tree-sha1 = "ed2c4abadf84c53d9e58510b5fc48912c2336fbb"
55+
uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
56+
version = "2.2.0"
57+
58+
[[CutPruners]]
59+
deps = ["Compat", "MathProgBase"]
60+
git-tree-sha1 = "e8105c939afcb8540a8525105120b1126bd1a5aa"
61+
uuid = "65d46eb8-70e9-5a30-bf48-2afa3a021b8f"
62+
version = "0.1.0"
63+
64+
[[DataStructures]]
65+
deps = ["InteractiveUtils", "OrderedCollections"]
66+
git-tree-sha1 = "b7720de347734f4716d1815b00ce5664ed6bbfd4"
67+
uuid = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
68+
version = "0.17.9"
69+
70+
[[Dates]]
71+
deps = ["Printf"]
72+
uuid = "ade2ca70-3891-5945-98fb-dc099432e06a"
73+
74+
[[DelimitedFiles]]
75+
deps = ["Mmap"]
76+
uuid = "8bb1440f-4735-579b-a4ab-409b98df4dab"
77+
78+
[[DiffResults]]
79+
deps = ["StaticArrays"]
80+
git-tree-sha1 = "da24935df8e0c6cf28de340b958f6aac88eaa0cc"
81+
uuid = "163ba53b-c6d8-5494-b064-1a9d43ac40c5"
82+
version = "1.0.2"
83+
84+
[[DiffRules]]
85+
deps = ["NaNMath", "Random", "SpecialFunctions"]
86+
git-tree-sha1 = "10dca52cf6d4a62d82528262921daf63b99704a2"
87+
uuid = "b552c78f-8df3-52c6-915a-8e097449b14b"
88+
version = "1.0.0"
89+
90+
[[Distributed]]
91+
deps = ["LinearAlgebra", "Random", "Serialization", "Sockets"]
92+
uuid = "8ba89e20-285c-5b6f-9357-94700520ee1b"
93+
94+
[[DocStringExtensions]]
95+
deps = ["LibGit2", "Markdown", "Pkg", "Test"]
96+
git-tree-sha1 = "88bb0edb352b16608036faadcc071adda068582a"
97+
uuid = "ffbed154-4ef7-542d-bbb7-c09d3a79fcae"
98+
version = "0.8.1"
99+
100+
[[ForwardDiff]]
101+
deps = ["CommonSubexpressions", "DiffResults", "DiffRules", "NaNMath", "Random", "SpecialFunctions", "StaticArrays"]
102+
git-tree-sha1 = "88b082d492be6b63f967b6c96b352e25ced1a34c"
103+
uuid = "f6369f11-7733-5829-9624-2563aa707210"
104+
version = "0.10.9"
105+
106+
[[GLPK]]
107+
deps = ["BinaryProvider", "Libdl", "MathOptInterface", "SparseArrays"]
108+
git-tree-sha1 = "3420033e843e140d9237238d69937a5bc7292e5a"
109+
uuid = "60bf3e95-4087-53dc-ae20-288a0d20c6a6"
110+
version = "0.12.1"
111+
112+
[[HTTP]]
113+
deps = ["Base64", "Dates", "IniFile", "MbedTLS", "Sockets"]
114+
git-tree-sha1 = "5c49dab19938b119fe204fd7d7e8e174f4e9c68b"
115+
uuid = "cd3eb016-35fb-5094-929b-558a96fad6f3"
116+
version = "0.8.8"
117+
118+
[[Inflate]]
119+
deps = ["Pkg", "Printf", "Random", "Test"]
120+
git-tree-sha1 = "b7ec91c153cf8bff9aff58b39497925d133ef7fd"
121+
uuid = "d25df0c9-e2be-5dd7-82c8-3ad0b3e990b9"
122+
version = "0.1.1"
123+
124+
[[IniFile]]
125+
deps = ["Test"]
126+
git-tree-sha1 = "098e4d2c533924c921f9f9847274f2ad89e018b8"
127+
uuid = "83e8ac13-25f8-5344-8a64-a9f2b223428f"
128+
version = "0.5.0"
129+
130+
[[InteractiveUtils]]
131+
deps = ["LinearAlgebra", "Markdown"]
132+
uuid = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
133+
134+
[[JSON]]
135+
deps = ["Dates", "Mmap", "Parsers", "Unicode"]
136+
git-tree-sha1 = "b34d7cef7b337321e97d22242c3c2b91f476748e"
137+
uuid = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
138+
version = "0.21.0"
139+
140+
[[JSONSchema]]
141+
deps = ["BinaryProvider", "HTTP", "JSON"]
142+
git-tree-sha1 = "b0a7f9328967df5213691d318a03cf70ea8c76b1"
143+
uuid = "7d188eb4-7ad8-530c-ae41-71a32a6d4692"
144+
version = "0.2.0"
145+
146+
[[JuMP]]
147+
deps = ["Calculus", "DataStructures", "ForwardDiff", "LinearAlgebra", "MathOptInterface", "NaNMath", "Random", "SparseArrays", "Statistics"]
148+
git-tree-sha1 = "a970a86abc924f2c126cdb4978a5e8923d0e7b22"
149+
uuid = "4076af6c-e467-56ae-b986-b466b2749572"
150+
version = "0.20.0"
151+
152+
[[LibGit2]]
153+
uuid = "76f85450-5226-5b5a-8eaa-529ad045b433"
154+
155+
[[Libdl]]
156+
uuid = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
157+
158+
[[LightGraphs]]
159+
deps = ["ArnoldiMethod", "DataStructures", "Distributed", "Inflate", "LinearAlgebra", "Random", "SharedArrays", "SimpleTraits", "SparseArrays", "Statistics"]
160+
git-tree-sha1 = "a0d4bcea4b9c056da143a5ded3c2b7f7740c2d41"
161+
uuid = "093fc24a-ae57-5d10-9952-331d41423f4d"
162+
version = "1.3.0"
163+
164+
[[LinearAlgebra]]
165+
deps = ["Libdl"]
166+
uuid = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
167+
168+
[[Logging]]
169+
uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
170+
171+
[[MacroTools]]
172+
deps = ["DataStructures", "Markdown", "Random"]
173+
git-tree-sha1 = "e2fc7a55bb2224e203bbd8b59f72b91323233458"
174+
uuid = "1914dd2f-81c6-5fcd-8719-6d5c9610ff09"
175+
version = "0.5.3"
176+
177+
[[Markdown]]
178+
deps = ["Base64"]
179+
uuid = "d6f4376e-aef5-505a-96c1-9c027394607a"
180+
181+
[[MathOptInterface]]
182+
deps = ["BenchmarkTools", "CodecBzip2", "CodecZlib", "JSON", "JSONSchema", "LinearAlgebra", "MutableArithmetics", "OrderedCollections", "SparseArrays", "Test", "Unicode"]
183+
git-tree-sha1 = "793416d916e8fb1d16cdd016dabe8df87c636198"
184+
uuid = "b8f27783-ece8-5eb3-8dc8-9495eed66fee"
185+
version = "0.9.10"
186+
187+
[[MathProgBase]]
188+
deps = ["Compat"]
189+
git-tree-sha1 = "3bf2e534e635df810e5f4b4f1a8b6de9004a0d53"
190+
uuid = "fdba3010-5040-5b88-9595-932c9decdf73"
191+
version = "0.7.7"
192+
193+
[[MbedTLS]]
194+
deps = ["BinaryProvider", "Dates", "Distributed", "Libdl", "Random", "Sockets", "Test"]
195+
git-tree-sha1 = "2d94286a9c2f52c63a16146bb86fd6cdfbf677c6"
196+
uuid = "739be429-bea8-5141-9913-cc70e7f3736d"
197+
version = "0.6.8"
198+
199+
[[Mmap]]
200+
uuid = "a63ad114-7e13-5084-954f-fe012c677804"
201+
202+
[[MutableArithmetics]]
203+
deps = ["LinearAlgebra", "SparseArrays", "Test"]
204+
git-tree-sha1 = "f1c1ceab8adc1141ac5eba3881b0d53b277949c0"
205+
uuid = "d8a4904e-b15c-11e9-3269-09a3773c0cb0"
206+
version = "0.2.2"
207+
208+
[[NaNMath]]
209+
git-tree-sha1 = "928b8ca9b2791081dc71a51c55347c27c618760f"
210+
uuid = "77ba4419-2d1f-58cd-9bb1-8ffee604a2e3"
211+
version = "0.3.3"
212+
213+
[[OrderedCollections]]
214+
deps = ["Random", "Serialization", "Test"]
215+
git-tree-sha1 = "c4c13474d23c60d20a67b217f1d7f22a40edf8f1"
216+
uuid = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
217+
version = "1.1.0"
218+
219+
[[ParameterJuMP]]
220+
deps = ["JuMP", "MathOptInterface", "SparseArrays"]
221+
git-tree-sha1 = "061bbb1cfaed57f3a65c5e688285f8da9bef0178"
222+
uuid = "774612a8-9878-5177-865a-ca53ae2495f9"
223+
version = "0.1.2"
224+
225+
[[Parsers]]
226+
deps = ["Dates", "Test"]
227+
git-tree-sha1 = "d112c19ccca00924d5d3a38b11ae2b4b268dda39"
228+
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
229+
version = "0.3.11"
230+
231+
[[Pkg]]
232+
deps = ["Dates", "LibGit2", "Markdown", "Printf", "REPL", "Random", "SHA", "UUIDs"]
233+
uuid = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
234+
235+
[[Printf]]
236+
deps = ["Unicode"]
237+
uuid = "de0858da-6303-5e67-8744-51eddeeeb8d7"
238+
239+
[[REPL]]
240+
deps = ["InteractiveUtils", "Markdown", "Sockets"]
241+
uuid = "3fa0cd96-eef1-5676-8a61-b3b8758bbffb"
242+
243+
[[Random]]
244+
deps = ["Serialization"]
245+
uuid = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
246+
247+
[[SHA]]
248+
uuid = "ea8e919c-243c-51af-8825-aaa63cd721ce"
249+
250+
[[Serialization]]
251+
uuid = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
252+
253+
[[SharedArrays]]
254+
deps = ["Distributed", "Mmap", "Random", "Serialization"]
255+
uuid = "1a1011a3-84de-559e-8e89-a11a2f7dc383"
256+
257+
[[SimpleTraits]]
258+
deps = ["InteractiveUtils", "MacroTools"]
259+
git-tree-sha1 = "2bdf3b6300a9d66fe29ee8bb51ba100c4df9ecbc"
260+
uuid = "699a6c99-e7fa-54fc-8d76-47d257e15c1d"
261+
version = "0.9.1"
262+
263+
[[Sockets]]
264+
uuid = "6462fe0b-24de-5631-8697-dd941f90decc"
265+
266+
[[SparseArrays]]
267+
deps = ["LinearAlgebra", "Random"]
268+
uuid = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
269+
270+
[[SpecialFunctions]]
271+
deps = ["BinDeps", "BinaryProvider", "Libdl"]
272+
git-tree-sha1 = "3bdd374b6fd78faf0119b8c5d538788dbf910c6e"
273+
uuid = "276daf66-3868-5448-9aa4-cd146d93841b"
274+
version = "0.8.0"
275+
276+
[[StaticArrays]]
277+
deps = ["LinearAlgebra", "Random", "Statistics"]
278+
git-tree-sha1 = "5a3bcb6233adabde68ebc97be66e95dcb787424c"
279+
uuid = "90137ffa-7385-5640-81b9-e52037218182"
280+
version = "0.12.1"
281+
282+
[[Statistics]]
283+
deps = ["LinearAlgebra", "SparseArrays"]
284+
uuid = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
285+
286+
[[StochOptInterface]]
287+
deps = ["Compat", "DocStringExtensions", "LightGraphs", "TimerOutputs"]
288+
git-tree-sha1 = "81b9ad624b602e8440af3fd60eabef130d7bff09"
289+
uuid = "ddbffdd9-5b1a-5f20-b6eb-597a58a751db"
290+
version = "0.0.1"
291+
292+
[[StructJuMP]]
293+
deps = ["JuMP", "LinearAlgebra", "MathOptInterface", "ParameterJuMP"]
294+
git-tree-sha1 = "84d8135eabb9c3b63f98de5fc75fe48458cc0827"
295+
repo-rev = "master"
296+
repo-url = "https://github.com/StructJuMP/StructJuMP.jl.git"
297+
uuid = "34f15cae-5318-50c9-93d3-9feadd34e321"
298+
version = "0.1.0"
299+
300+
[[Test]]
301+
deps = ["Distributed", "InteractiveUtils", "Logging", "Random"]
302+
uuid = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
303+
304+
[[TimerOutputs]]
305+
deps = ["Printf"]
306+
git-tree-sha1 = "311765af81bbb48d7bad01fb016d9c328c6ede03"
307+
uuid = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
308+
version = "0.5.3"
309+
310+
[[TranscodingStreams]]
311+
deps = ["Random", "Test"]
312+
git-tree-sha1 = "7c53c35547de1c5b9d46a4797cf6d8253807108c"
313+
uuid = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
314+
version = "0.9.5"
315+
316+
[[URIParser]]
317+
deps = ["Test", "Unicode"]
318+
git-tree-sha1 = "6ddf8244220dfda2f17539fa8c9de20d6c575b69"
319+
uuid = "30578b45-9adc-5946-b283-645ec420af67"
320+
version = "0.4.0"
321+
322+
[[UUIDs]]
323+
deps = ["Random"]
324+
uuid = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
325+
326+
[[Unicode]]
327+
uuid = "4ec0a83e-493e-50e2-b9ac-8f72acf5a8f5"

‎Project.toml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name = "StructDualDynProg"
2+
uuid = "5d41aeb0-57df-5a94-a3c4-60ba49600646"
3+
4+
[deps]
5+
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
6+
CutPruners = "65d46eb8-70e9-5a30-bf48-2afa3a021b8f"
7+
GLPK = "60bf3e95-4087-53dc-ae20-288a0d20c6a6"
8+
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
9+
LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
10+
MathProgBase = "fdba3010-5040-5b88-9595-932c9decdf73"
11+
StochOptInterface = "ddbffdd9-5b1a-5f20-b6eb-597a58a751db"
12+
StructJuMP = "34f15cae-5318-50c9-93d3-9feadd34e321"
13+
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
14+
15+
[compat]
16+
Compat = "2, 3"
17+
JuMP = "= 0.20"
18+
StructJuMP = "= 0.1"
19+
julia = "1"
20+
21+
[extras]
22+
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
23+
24+
[targets]
25+
test = ["Test"]

‎test/solvers.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ iscpx(solver) = occursin("CplexSolver", string(typeof(solver)))
1616
xpr = false && try_import(:Xpress)
1717
clp = false && try_import(:Clp)
1818
isclp(solver) = occursin("ClpSolver", string(typeof(solver)))
19-
glp = try_import(:GLPKMathProgInterface)
2019
msk = false && try_import(:Mosek)
2120
ismsk(solver) = occursin("MosekSolver", string(typeof(solver)))
2221

@@ -25,5 +24,4 @@ grb && push!(lp_solvers, Gurobi.GurobiSolver(OutputFlag=0))
2524
cpx && push!(lp_solvers, CPLEX.CplexSolver(CPX_PARAM_SCRIND=0, CPX_PARAM_REDUCE=0))
2625
xpr && push!(lp_solvers, Xpress.XpressSolver(OUTPUTLOG=0))
2726
clp && push!(lp_solvers, Clp.ClpSolver())
28-
glp && push!(lp_solvers, GLPKMathProgInterface.GLPKSolverLP())
2927
msk && push!(lp_solvers, Mosek.MosekSolver(QUIET=true))

0 commit comments

Comments
 (0)