Skip to content

Commit e027418

Browse files
tmigottmigot
committed
format
1 parent 618d482 commit e027418

File tree

6 files changed

+56
-56
lines changed

6 files changed

+56
-56
lines changed

‎src/ADNLPProblems/ADNLPProblems.jl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@ const data_path = joinpath(@__DIR__, "..", "..", "data")
77

88
reshape_array(a, dims) = invoke(Base._reshape, Tuple{AbstractArray, typeof(dims)}, a, dims)
99

10-
const _data_loaded = Dict{Symbol,Ref{Bool}}()
11-
const _data_locks = Dict{Symbol,ReentrantLock}()
10+
const _data_loaded = Dict{Symbol, Ref{Bool}}()
11+
const _data_locks = Dict{Symbol, ReentrantLock}()
1212

1313
function _ensure_data!(key::Symbol, relpath::AbstractString)
14-
flag = get!(_data_loaded, key, Ref(false))
14+
flag = get!(_data_loaded, key, Ref(false))
15+
flag[] && return
16+
lck = get!(_data_locks, key, ReentrantLock())
17+
lock(lck) do
1518
flag[] && return
16-
lck = get!(_data_locks, key, ReentrantLock())
17-
lock(lck) do
18-
flag[] && return
19-
Base.include(@__MODULE__, joinpath(@__DIR__, "..", "..", "data", relpath))
20-
flag[] = true
21-
end
22-
return
19+
Base.include(@__MODULE__, joinpath(@__DIR__, "..", "..", "data", relpath))
20+
flag[] = true
21+
end
22+
return
2323
end
2424

2525
@init begin

‎src/ADNLPProblems/tetra.jl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,36 +73,36 @@ end
7373

7474
export tetra_duct12
7575
function tetra_duct12(; kwargs...)
76-
_ensure_data!(:tetra_duct12, "tetra_duct12.jl")
77-
tetra(xe_duct12, TETS_duct12, Const_duct12; name="tetra_duct12", kwargs...)
76+
_ensure_data!(:tetra_duct12, "tetra_duct12.jl")
77+
tetra(xe_duct12, TETS_duct12, Const_duct12; name = "tetra_duct12", kwargs...)
7878
end
7979

8080
export tetra_duct15
8181
function tetra_duct15(; kwargs...)
82-
_ensure_data!(:tetra_duct15, "tetra_duct15.jl")
83-
tetra(xe_duct15, TETS_duct15, Const_duct15; name="tetra_duct15", kwargs...)
82+
_ensure_data!(:tetra_duct15, "tetra_duct15.jl")
83+
tetra(xe_duct15, TETS_duct15, Const_duct15; name = "tetra_duct15", kwargs...)
8484
end
8585

8686
export tetra_duct20
8787
function tetra_duct20(; kwargs...)
88-
_ensure_data!(:tetra_duct20, "tetra_duct20.jl")
89-
tetra(xe_duct20, TETS_duct20, Const_duct20; name="tetra_duct20", kwargs...)
88+
_ensure_data!(:tetra_duct20, "tetra_duct20.jl")
89+
tetra(xe_duct20, TETS_duct20, Const_duct20; name = "tetra_duct20", kwargs...)
9090
end
9191

9292
export tetra_hook
9393
function tetra_hook(; kwargs...)
94-
_ensure_data!(:tetra_hook, "tetra_hook.jl")
95-
tetra(xe_hook, TETS_hook, Const_hook; name = "tetra_hook", kwargs...)
94+
_ensure_data!(:tetra_hook, "tetra_hook.jl")
95+
tetra(xe_hook, TETS_hook, Const_hook; name = "tetra_hook", kwargs...)
9696
end
9797

9898
export tetra_foam5
9999
function tetra_foam5(; kwargs...)
100-
_ensure_data!(:tetra_foam5, "tetra_foam5.jl")
101-
tetra(xe_foam5, TETS_foam5, Const_foam5; name = "tetra_foam5", kwargs...)
100+
_ensure_data!(:tetra_foam5, "tetra_foam5.jl")
101+
tetra(xe_foam5, TETS_foam5, Const_foam5; name = "tetra_foam5", kwargs...)
102102
end
103103

104104
export tetra_gear
105105
function tetra_gear(; kwargs...)
106-
_ensure_data!(:tetra_gear, "tetra_gear.jl")
107-
tetra(xe_gear, TETS_gear, Const_gear; name = "tetra_gear", kwargs...)
106+
_ensure_data!(:tetra_gear, "tetra_gear.jl")
107+
tetra(xe_gear, TETS_gear, Const_gear; name = "tetra_gear", kwargs...)
108108
end

‎src/ADNLPProblems/triangle.jl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,18 @@ end
6262

6363
export triangle_deer
6464
function triangle_deer(; kwargs...)
65-
_ensure_data!(:triangle_deer, "triangle_deer.jl")
66-
tetra(xe_deer, TRIS_deer, Const_deer; name = "triangle_deer", kwargs...)
65+
_ensure_data!(:triangle_deer, "triangle_deer.jl")
66+
tetra(xe_deer, TRIS_deer, Const_deer; name = "triangle_deer", kwargs...)
6767
end
6868

6969
export triangle_pacman
7070
function triangle_pacman(; kwargs...)
71-
_ensure_data!(:triangle_pacman, "triangle_pacman.jl")
72-
tetra(xe_pacman, TRIS_pacman, Const_pacman; name = "triangle_pacman", kwargs...)
71+
_ensure_data!(:triangle_pacman, "triangle_pacman.jl")
72+
tetra(xe_pacman, TRIS_pacman, Const_pacman; name = "triangle_pacman", kwargs...)
7373
end
7474

7575
export triangle_turtle
7676
function triangle_turtle(; kwargs...)
77-
_ensure_data!(:triangle_turtle, "triangle_turtle.jl")
78-
tetra(xe_turtle, TRIS_turtle, Const_turtle; name = "triangle_turtle", kwargs...)
77+
_ensure_data!(:triangle_turtle, "triangle_turtle.jl")
78+
tetra(xe_turtle, TRIS_turtle, Const_turtle; name = "triangle_turtle", kwargs...)
7979
end

‎src/PureJuMP/PureJuMP.jl‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ module PureJuMP
33
const default_nvar = 100
44
const data_path = joinpath(@__DIR__, "..", "..", "data")
55

6-
const _data_loaded = Dict{Symbol,Ref{Bool}}()
7-
const _data_locks = Dict{Symbol,ReentrantLock}()
6+
const _data_loaded = Dict{Symbol, Ref{Bool}}()
7+
const _data_locks = Dict{Symbol, ReentrantLock}()
88

99
function _ensure_data!(key::Symbol, relpath::AbstractString)
10-
flag = get!(_data_loaded, key, Ref(false))
10+
flag = get!(_data_loaded, key, Ref(false))
11+
flag[] && return
12+
lck = get!(_data_locks, key, ReentrantLock())
13+
lock(lck) do
1114
flag[] && return
12-
lck = get!(_data_locks, key, ReentrantLock())
13-
lock(lck) do
14-
flag[] && return
15-
Base.include(@__MODULE__, joinpath(@__DIR__, "..", "..", "data", relpath))
16-
flag[] = true
17-
end
18-
return
15+
Base.include(@__MODULE__, joinpath(@__DIR__, "..", "..", "data", relpath))
16+
flag[] = true
17+
end
18+
return
1919
end
2020

2121
using JuMP, LinearAlgebra, SpecialFunctions

‎src/PureJuMP/tetra.jl‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -82,36 +82,36 @@ end
8282

8383
export tetra_duct12
8484
function tetra_duct12(; kwargs...)
85-
_ensure_data!(:tetra_duct12, "tetra_duct12.jl")
86-
tetra(xe_duct12, TETS_duct12, Const_duct12; name="tetra_duct12", kwargs...)
85+
_ensure_data!(:tetra_duct12, "tetra_duct12.jl")
86+
tetra(xe_duct12, TETS_duct12, Const_duct12; name = "tetra_duct12", kwargs...)
8787
end
8888

8989
export tetra_duct15
9090
function tetra_duct15(; kwargs...)
91-
_ensure_data!(:tetra_duct15, "tetra_duct15.jl")
92-
tetra(xe_duct15, TETS_duct15, Const_duct15; name="tetra_duct15", kwargs...)
91+
_ensure_data!(:tetra_duct15, "tetra_duct15.jl")
92+
tetra(xe_duct15, TETS_duct15, Const_duct15; name = "tetra_duct15", kwargs...)
9393
end
9494

9595
export tetra_duct20
9696
function tetra_duct20(; kwargs...)
97-
_ensure_data!(:tetra_duct20, "tetra_duct20.jl")
98-
tetra(xe_duct20, TETS_duct20, Const_duct20; name="tetra_duct20", kwargs...)
97+
_ensure_data!(:tetra_duct20, "tetra_duct20.jl")
98+
tetra(xe_duct20, TETS_duct20, Const_duct20; name = "tetra_duct20", kwargs...)
9999
end
100100

101101
export tetra_hook
102102
function tetra_hook(; kwargs...)
103-
_ensure_data!(:tetra_hook, "tetra_hook.jl")
104-
tetra(xe_hook, TETS_hook, Const_hook; name = "tetra_hook", kwargs...)
103+
_ensure_data!(:tetra_hook, "tetra_hook.jl")
104+
tetra(xe_hook, TETS_hook, Const_hook; name = "tetra_hook", kwargs...)
105105
end
106106

107107
export tetra_foam5
108108
function tetra_foam5(; kwargs...)
109-
_ensure_data!(:tetra_foam5, "tetra_foam5.jl")
110-
tetra(xe_foam5, TETS_foam5, Const_foam5; name = "tetra_foam5", kwargs...)
109+
_ensure_data!(:tetra_foam5, "tetra_foam5.jl")
110+
tetra(xe_foam5, TETS_foam5, Const_foam5; name = "tetra_foam5", kwargs...)
111111
end
112112

113113
export tetra_gear
114114
function tetra_gear(; kwargs...)
115-
_ensure_data!(:tetra_gear, "tetra_gear.jl")
116-
tetra(xe_gear, TETS_gear, Const_gear; name = "tetra_gear", kwargs...)
115+
_ensure_data!(:tetra_gear, "tetra_gear.jl")
116+
tetra(xe_gear, TETS_gear, Const_gear; name = "tetra_gear", kwargs...)
117117
end

‎src/PureJuMP/triangle.jl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,18 @@ end
6060

6161
export triangle_deer
6262
function triangle_deer(; kwargs...)
63-
_ensure_data!(:triangle_deer, "triangle_deer.jl")
64-
tetra(xe_deer, TRIS_deer, Const_deer; name = "triangle_deer", kwargs...)
63+
_ensure_data!(:triangle_deer, "triangle_deer.jl")
64+
tetra(xe_deer, TRIS_deer, Const_deer; name = "triangle_deer", kwargs...)
6565
end
6666

6767
export triangle_pacman
6868
function triangle_pacman(; kwargs...)
69-
_ensure_data!(:triangle_pacman, "triangle_pacman.jl")
70-
tetra(xe_pacman, TRIS_pacman, Const_pacman; name = "triangle_pacman", kwargs...)
69+
_ensure_data!(:triangle_pacman, "triangle_pacman.jl")
70+
tetra(xe_pacman, TRIS_pacman, Const_pacman; name = "triangle_pacman", kwargs...)
7171
end
7272

7373
export triangle_turtle
7474
function triangle_turtle(; kwargs...)
75-
_ensure_data!(:triangle_turtle, "triangle_turtle.jl")
76-
tetra(xe_turtle, TRIS_turtle, Const_turtle; name = "triangle_turtle", kwargs...)
75+
_ensure_data!(:triangle_turtle, "triangle_turtle.jl")
76+
tetra(xe_turtle, TRIS_turtle, Const_turtle; name = "triangle_turtle", kwargs...)
7777
end

0 commit comments

Comments
 (0)