Skip to content

Commit 8d35652

Browse files
tmigottmigot
committed
fix world age bug
1 parent 6315ab9 commit 8d35652

4 files changed

Lines changed: 72 additions & 18 deletions

File tree

‎src/ADNLPProblems/tetra.jl‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,35 +74,53 @@ end
7474
export tetra_duct12
7575
function tetra_duct12(; kwargs...)
7676
_ensure_data!(:tetra_duct12, "tetra_duct12.jl")
77-
tetra(xe_duct12, TETS_duct12, Const_duct12; name = "tetra_duct12", kwargs...)
77+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_duct12)
78+
TETS = Base.invokelatest(getfield, @__MODULE__, :TETS_duct12)
79+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_duct12)
80+
tetra(xe, TETS, Const; name = "tetra_duct12", kwargs...)
7881
end
7982

8083
export tetra_duct15
8184
function tetra_duct15(; kwargs...)
8285
_ensure_data!(:tetra_duct15, "tetra_duct15.jl")
83-
tetra(xe_duct15, TETS_duct15, Const_duct15; name = "tetra_duct15", kwargs...)
86+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_duct15)
87+
TETS = Base.invokelatest(getfield, @__MODULE__, :TETS_duct15)
88+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_duct15)
89+
tetra(xe, TETS, Const; name = "tetra_duct15", kwargs...)
8490
end
8591

8692
export tetra_duct20
8793
function tetra_duct20(; kwargs...)
8894
_ensure_data!(:tetra_duct20, "tetra_duct20.jl")
89-
tetra(xe_duct20, TETS_duct20, Const_duct20; name = "tetra_duct20", kwargs...)
95+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_duct20)
96+
TETS = Base.invokelatest(getfield, @__MODULE__, :TETS_duct20)
97+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_duct20)
98+
tetra(xe, TETS, Const; name = "tetra_duct20", kwargs...)
9099
end
91100

92101
export tetra_hook
93102
function tetra_hook(; kwargs...)
94103
_ensure_data!(:tetra_hook, "tetra_hook.jl")
95-
tetra(xe_hook, TETS_hook, Const_hook; name = "tetra_hook", kwargs...)
104+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_hook)
105+
TETS = Base.invokelatest(getfield, @__MODULE__, :TETS_hook)
106+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_hook)
107+
tetra(xe, TETS, Const; name = "tetra_hook", kwargs...)
96108
end
97109

98110
export tetra_foam5
99111
function tetra_foam5(; kwargs...)
100112
_ensure_data!(:tetra_foam5, "tetra_foam5.jl")
101-
tetra(xe_foam5, TETS_foam5, Const_foam5; name = "tetra_foam5", kwargs...)
113+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_foam5)
114+
TETS = Base.invokelatest(getfield, @__MODULE__, :TETS_foam5)
115+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_foam5)
116+
tetra(xe, TETS, Const; name = "tetra_foam5", kwargs...)
102117
end
103118

104119
export tetra_gear
105120
function tetra_gear(; kwargs...)
106121
_ensure_data!(:tetra_gear, "tetra_gear.jl")
107-
tetra(xe_gear, TETS_gear, Const_gear; name = "tetra_gear", kwargs...)
122+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_gear)
123+
TETS = Base.invokelatest(getfield, @__MODULE__, :TETS_gear)
124+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_gear)
125+
tetra(xe, TETS, Const; name = "tetra_gear", kwargs...)
108126
end

‎src/ADNLPProblems/triangle.jl‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,26 @@ end
6363
export triangle_deer
6464
function triangle_deer(; kwargs...)
6565
_ensure_data!(:triangle_deer, "triangle_deer.jl")
66-
triangle(xe_deer, TRIS_deer, Const_deer; name = "triangle_deer", kwargs...)
66+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_deer)
67+
TRIS = Base.invokelatest(getfield, @__MODULE__, :TRIS_deer)
68+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_deer)
69+
triangle(xe, TRIS, Const; name = "triangle_deer", kwargs...)
6770
end
6871

6972
export triangle_pacman
7073
function triangle_pacman(; kwargs...)
7174
_ensure_data!(:triangle_pacman, "triangle_pacman.jl")
72-
triangle(xe_pacman, TRIS_pacman, Const_pacman; name = "triangle_pacman", kwargs...)
75+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_pacman)
76+
TRIS = Base.invokelatest(getfield, @__MODULE__, :TRIS_pacman)
77+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_pacman)
78+
triangle(xe, TRIS, Const; name = "triangle_pacman", kwargs...)
7379
end
7480

7581
export triangle_turtle
7682
function triangle_turtle(; kwargs...)
7783
_ensure_data!(:triangle_turtle, "triangle_turtle.jl")
78-
triangle(xe_turtle, TRIS_turtle, Const_turtle; name = "triangle_turtle", kwargs...)
84+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_turtle)
85+
TRIS = Base.invokelatest(getfield, @__MODULE__, :TRIS_turtle)
86+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_turtle)
87+
triangle(xe, TRIS, Const; name = "triangle_turtle", kwargs...)
7988
end

‎src/PureJuMP/tetra.jl‎

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,35 +83,53 @@ end
8383
export tetra_duct12
8484
function tetra_duct12(; kwargs...)
8585
_ensure_data!(:tetra_duct12, "tetra_duct12.jl")
86-
tetra(xe_duct12, TETS_duct12, Const_duct12; name = "tetra_duct12", kwargs...)
86+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_duct12)
87+
TETS = Base.invokelatest(getfield, @__MODULE__, :TETS_duct12)
88+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_duct12)
89+
tetra(xe, TETS, Const; name = "tetra_duct12", kwargs...)
8790
end
8891

8992
export tetra_duct15
9093
function tetra_duct15(; kwargs...)
9194
_ensure_data!(:tetra_duct15, "tetra_duct15.jl")
92-
tetra(xe_duct15, TETS_duct15, Const_duct15; name = "tetra_duct15", kwargs...)
95+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_duct15)
96+
TETS = Base.invokelatest(getfield, @__MODULE__, :TETS_duct15)
97+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_duct15)
98+
tetra(xe, TETS, Const; name = "tetra_duct15", kwargs...)
9399
end
94100

95101
export tetra_duct20
96102
function tetra_duct20(; kwargs...)
97103
_ensure_data!(:tetra_duct20, "tetra_duct20.jl")
98-
tetra(xe_duct20, TETS_duct20, Const_duct20; name = "tetra_duct20", kwargs...)
104+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_duct20)
105+
TETS = Base.invokelatest(getfield, @__MODULE__, :TETS_duct20)
106+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_duct20)
107+
tetra(xe, TETS, Const; name = "tetra_duct20", kwargs...)
99108
end
100109

101110
export tetra_hook
102111
function tetra_hook(; kwargs...)
103112
_ensure_data!(:tetra_hook, "tetra_hook.jl")
104-
tetra(xe_hook, TETS_hook, Const_hook; name = "tetra_hook", kwargs...)
113+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_hook)
114+
TETS = Base.invokelatest(getfield, @__MODULE__, :TETS_hook)
115+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_hook)
116+
tetra(xe, TETS, Const; name = "tetra_hook", kwargs...)
105117
end
106118

107119
export tetra_foam5
108120
function tetra_foam5(; kwargs...)
109121
_ensure_data!(:tetra_foam5, "tetra_foam5.jl")
110-
tetra(xe_foam5, TETS_foam5, Const_foam5; name = "tetra_foam5", kwargs...)
122+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_foam5)
123+
TETS = Base.invokelatest(getfield, @__MODULE__, :TETS_foam5)
124+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_foam5)
125+
tetra(xe, TETS, Const; name = "tetra_foam5", kwargs...)
111126
end
112127

113128
export tetra_gear
114129
function tetra_gear(; kwargs...)
115130
_ensure_data!(:tetra_gear, "tetra_gear.jl")
116-
tetra(xe_gear, TETS_gear, Const_gear; name = "tetra_gear", kwargs...)
131+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_gear)
132+
TETS = Base.invokelatest(getfield, @__MODULE__, :TETS_gear)
133+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_gear)
134+
tetra(xe, TETS, Const; name = "tetra_gear", kwargs...)
117135
end

‎src/PureJuMP/triangle.jl‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,26 @@ end
6161
export triangle_deer
6262
function triangle_deer(; kwargs...)
6363
_ensure_data!(:triangle_deer, "triangle_deer.jl")
64-
triangle(xe_deer, TRIS_deer, Const_deer; name = "triangle_deer", kwargs...)
64+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_deer)
65+
TRIS = Base.invokelatest(getfield, @__MODULE__, :TRIS_deer)
66+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_deer)
67+
triangle(xe, TRIS, Const; name = "triangle_deer", kwargs...)
6568
end
6669

6770
export triangle_pacman
6871
function triangle_pacman(; kwargs...)
6972
_ensure_data!(:triangle_pacman, "triangle_pacman.jl")
70-
triangle(xe_pacman, TRIS_pacman, Const_pacman; name = "triangle_pacman", kwargs...)
73+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_pacman)
74+
TRIS = Base.invokelatest(getfield, @__MODULE__, :TRIS_pacman)
75+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_pacman)
76+
triangle(xe, TRIS, Const; name = "triangle_pacman", kwargs...)
7177
end
7278

7379
export triangle_turtle
7480
function triangle_turtle(; kwargs...)
7581
_ensure_data!(:triangle_turtle, "triangle_turtle.jl")
76-
triangle(xe_turtle, TRIS_turtle, Const_turtle; name = "triangle_turtle", kwargs...)
82+
xe = Base.invokelatest(getfield, @__MODULE__, :xe_turtle)
83+
TRIS = Base.invokelatest(getfield, @__MODULE__, :TRIS_turtle)
84+
Const= Base.invokelatest(getfield, @__MODULE__, :Const_turtle)
85+
triangle(xe, TRIS, Const; name = "triangle_turtle", kwargs...)
7786
end

0 commit comments

Comments
 (0)