File tree Expand file tree Collapse file tree 4 files changed +28
-2
lines changed Expand file tree Collapse file tree 4 files changed +28
-2
lines changed Original file line number Diff line number Diff line change @@ -93,7 +93,9 @@ function LMTR(
93
93
Hobj_hist = zeros (maxIter)
94
94
Complex_hist = zeros (Int, maxIter)
95
95
if verbose > 0
96
+ # ! format: off
96
97
@info @sprintf " %6s %8s %8s %8s %7s %7s %8s %7s %7s %7s %7s %1s" " outer" " inner" " f(x)" " h(x)" " √ξ1" " √ξ" " ρ" " Δ" " ‖x‖" " ‖s‖" " 1/ν" " TR"
98
+ # ! format: on
97
99
end
98
100
99
101
local ξ1
@@ -189,7 +191,9 @@ function LMTR(
189
191
TR_stat = (η2 ≤ ρk < Inf ) ? " ↗" : (ρk < η1 ? " ↘" : " =" )
190
192
191
193
if (verbose > 0 ) && (k % ptf == 0 )
194
+ # ! format: off
192
195
@info @sprintf " %6d %8d %8.1e %8.1e %7.1e %7.1e %8.1e %7.1e %7.1e %7.1e %7.1e %1s" k iter fk hk sqrt (ξ1) sqrt (ξ) ρk ψ. Δ χ (xk) sNorm νInv TR_stat
196
+ # ! format: on
193
197
end
194
198
195
199
if η2 ≤ ρk < Inf
@@ -226,7 +230,9 @@ function LMTR(
226
230
if k == 1
227
231
@info @sprintf " %6d %8s %8.1e %8.1e" k " " fk hk
228
232
elseif optimal
233
+ # ! format: off
229
234
@info @sprintf " %6d %8d %8.1e %8.1e %7.1e %7.1e %8s %7.1e %7.1e %7.1e %7.1e" k 1 fk hk sqrt (ξ1) sqrt (ξ1) " " ψ. Δ χ (xk) χ (s) νInv
235
+ # ! format: on
230
236
@info " LMTR: terminating with √ξ1 = $(sqrt (ξ1)) "
231
237
end
232
238
end
Original file line number Diff line number Diff line change @@ -90,8 +90,11 @@ function LM(
90
90
Fobj_hist = zeros (maxIter)
91
91
Hobj_hist = zeros (maxIter)
92
92
Complex_hist = zeros (Int, maxIter)
93
- verbose == 0 ||
93
+ if verbose > 0
94
+ # ! format: off
94
95
@info @sprintf " %6s %8s %8s %8s %7s %7s %8s %7s %7s %7s %7s %1s" " outer" " inner" " f(x)" " h(x)" " √ξ1" " √ξ" " ρ" " σ" " ‖x‖" " ‖s‖" " ‖Jₖ‖²" " reg"
96
+ # ! format: on
97
+ end
95
98
96
99
# main algorithm initialization
97
100
Fk = residual (nls, xk)
@@ -188,7 +191,9 @@ function LM(
188
191
σ_stat = (η2 ≤ ρk < Inf ) ? " ↘" : (ρk < η1 ? " ↗" : " =" )
189
192
190
193
if (verbose > 0 ) && (k % ptf == 0 )
194
+ # ! format: off
191
195
@info @sprintf " %6d %8d %8.1e %8.1e %7.1e %7.1e %8.1e %7.1e %7.1e %7.1e %7.1e %1s" k iter fk hk sqrt (ξ1) sqrt (ξ) ρk σk norm (xk) norm (s) νInv σ_stat
196
+ # ! format: off
192
197
end
193
198
194
199
if η2 ≤ ρk < Inf
@@ -226,7 +231,9 @@ function LM(
226
231
if k == 1
227
232
@info @sprintf " %6d %8s %8.1e %8.1e" k " " fk hk
228
233
elseif optimal
234
+ # ! format: off
229
235
@info @sprintf " %6d %8d %8.1e %8.1e %7.1e %7.1e %8s %7.1e %7.1e %7.1e %7.1e" k 1 fk hk sqrt (ξ1) sqrt (ξ1) " " σk norm (xk) norm (s) νInv
236
+ # ! format: on
230
237
@info " LM: terminating with √ξ1 = $(sqrt (ξ1)) "
231
238
end
232
239
end
Original file line number Diff line number Diff line change @@ -113,8 +113,11 @@ function R2(
113
113
Fobj_hist = zeros (maxIter)
114
114
Hobj_hist = zeros (maxIter)
115
115
Complex_hist = zeros (Int, maxIter)
116
- verbose == 0 ||
116
+ if verbose > 0
117
+ # ! format: off
117
118
@info @sprintf " %6s %8s %8s %7s %8s %7s %7s %7s %1s" " iter" " f(x)" " h(x)" " √ξ" " ρ" " σ" " ‖x‖" " ‖s‖" " "
119
+ # ! format: off
120
+ end
118
121
119
122
local ξ
120
123
k = 0
@@ -161,7 +164,9 @@ function R2(
161
164
σ_stat = (η2 ≤ ρk < Inf ) ? " ↘" : (ρk < η1 ? " ↗" : " =" )
162
165
163
166
if (verbose > 0 ) && (k % ptf == 0 )
167
+ # ! format: off
164
168
@info @sprintf " %6d %8.1e %8.1e %7.1e %8.1e %7.1e %7.1e %7.1e %1s" k fk hk sqrt (ξ) ρk σk norm (xk) norm (s) σ_stat
169
+ # ! format: on
165
170
end
166
171
167
172
if η2 ≤ ρk < Inf
@@ -191,7 +196,9 @@ function R2(
191
196
if k == 1
192
197
@info @sprintf " %6d %8.1e %8.1e" k fk hk
193
198
elseif optimal
199
+ # ! format: off
194
200
@info @sprintf " %6d %8.1e %8.1e %7.1e %8s %7.1e %7.1e %7.1e" k fk hk sqrt (ξ) " " σk norm (xk) norm (s)
201
+ # ! format: on
195
202
@info " R2: terminating with √ξ = $(sqrt (ξ)) "
196
203
end
197
204
end
Original file line number Diff line number Diff line change @@ -98,7 +98,9 @@ function TR(
98
98
Hobj_hist = zeros (maxIter)
99
99
Complex_hist = zeros (Int, maxIter)
100
100
if verbose > 0
101
+ # ! format: off
101
102
@info @sprintf " %6s %8s %8s %8s %7s %7s %8s %7s %7s %7s %7s %1s" " outer" " inner" " f(x)" " h(x)" " √ξ1" " √ξ" " ρ" " Δ" " ‖x‖" " ‖s‖" " ‖Bₖ‖" " TR"
103
+ # ! format: on
102
104
end
103
105
104
106
local ξ1
@@ -177,7 +179,9 @@ function TR(
177
179
TR_stat = (η2 ≤ ρk < Inf ) ? " ↗" : (ρk < η1 ? " ↘" : " =" )
178
180
179
181
if (verbose > 0 ) && (k % ptf == 0 )
182
+ # ! format: off
180
183
@info @sprintf " %6d %8d %8.1e %8.1e %7.1e %7.1e %8.1e %7.1e %7.1e %7.1e %7.1e %1s" k iter fk hk sqrt (ξ1) sqrt (ξ) ρk ψ. Δ χ (xk) sNorm νInv TR_stat
184
+ # ! format: on
181
185
end
182
186
183
187
if η2 ≤ ρk < Inf
@@ -215,7 +219,9 @@ function TR(
215
219
if k == 1
216
220
@info @sprintf " %6d %8s %8.1e %8.1e" k " " fk hk
217
221
elseif optimal
222
+ # ! format: off
218
223
@info @sprintf " %6d %8d %8.1e %8.1e %7.1e %7.1e %8s %7.1e %7.1e %7.1e %7.1e" k 1 fk hk sqrt (ξ1) sqrt (ξ1) " " ψ. Δ χ (xk) χ (s) νInv
224
+ # ! format: on
219
225
@info " TR: terminating with √ξ1 = $(sqrt (ξ1)) "
220
226
end
221
227
end
You can’t perform that action at this time.
0 commit comments