Skip to content

Commit 77f0ead

Browse files
committed
do not format log lines
1 parent 3dfcb0d commit 77f0ead

File tree

4 files changed

+28
-2
lines changed

4 files changed

+28
-2
lines changed

src/LMTR_alg.jl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ function LMTR(
9393
Hobj_hist = zeros(maxIter)
9494
Complex_hist = zeros(Int, maxIter)
9595
if verbose > 0
96+
#! format: off
9697
@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
9799
end
98100

99101
local ξ1
@@ -189,7 +191,9 @@ function LMTR(
189191
TR_stat = (η2 ρk < Inf) ? "" : (ρk < η1 ? "" : "=")
190192

191193
if (verbose > 0) && (k % ptf == 0)
194+
#! format: off
192195
@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
193197
end
194198

195199
if η2 ρk < Inf
@@ -226,7 +230,9 @@ function LMTR(
226230
if k == 1
227231
@info @sprintf "%6d %8s %8.1e %8.1e" k "" fk hk
228232
elseif optimal
233+
#! format: off
229234
@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
230236
@info "LMTR: terminating with √ξ1 = $(sqrt(ξ1))"
231237
end
232238
end

src/LM_alg.jl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,11 @@ function LM(
9090
Fobj_hist = zeros(maxIter)
9191
Hobj_hist = zeros(maxIter)
9292
Complex_hist = zeros(Int, maxIter)
93-
verbose == 0 ||
93+
if verbose > 0
94+
#! format: off
9495
@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
9598

9699
# main algorithm initialization
97100
Fk = residual(nls, xk)
@@ -188,7 +191,9 @@ function LM(
188191
σ_stat = (η2 ρk < Inf) ? "" : (ρk < η1 ? "" : "=")
189192

190193
if (verbose > 0) && (k % ptf == 0)
194+
#! format: off
191195
@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
192197
end
193198

194199
if η2 ρk < Inf
@@ -226,7 +231,9 @@ function LM(
226231
if k == 1
227232
@info @sprintf "%6d %8s %8.1e %8.1e" k "" fk hk
228233
elseif optimal
234+
#! format: off
229235
@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
230237
@info "LM: terminating with √ξ1 = $(sqrt(ξ1))"
231238
end
232239
end

src/R2_alg.jl

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,11 @@ function R2(
113113
Fobj_hist = zeros(maxIter)
114114
Hobj_hist = zeros(maxIter)
115115
Complex_hist = zeros(Int, maxIter)
116-
verbose == 0 ||
116+
if verbose > 0
117+
#! format: off
117118
@info @sprintf "%6s %8s %8s %7s %8s %7s %7s %7s %1s" "iter" "f(x)" "h(x)" "√ξ" "ρ" "σ" "‖x‖" "‖s‖" ""
119+
#! format: off
120+
end
118121

119122
local ξ
120123
k = 0
@@ -161,7 +164,9 @@ function R2(
161164
σ_stat = (η2 ρk < Inf) ? "" : (ρk < η1 ? "" : "=")
162165

163166
if (verbose > 0) && (k % ptf == 0)
167+
#! format: off
164168
@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
165170
end
166171

167172
if η2 ρk < Inf
@@ -191,7 +196,9 @@ function R2(
191196
if k == 1
192197
@info @sprintf "%6d %8.1e %8.1e" k fk hk
193198
elseif optimal
199+
#! format: off
194200
@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
195202
@info "R2: terminating with √ξ = $(sqrt(ξ))"
196203
end
197204
end

src/TR_alg.jl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,9 @@ function TR(
9898
Hobj_hist = zeros(maxIter)
9999
Complex_hist = zeros(Int, maxIter)
100100
if verbose > 0
101+
#! format: off
101102
@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
102104
end
103105

104106
local ξ1
@@ -177,7 +179,9 @@ function TR(
177179
TR_stat = (η2 ρk < Inf) ? "" : (ρk < η1 ? "" : "=")
178180

179181
if (verbose > 0) && (k % ptf == 0)
182+
#! format: off
180183
@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
181185
end
182186

183187
if η2 ρk < Inf
@@ -215,7 +219,9 @@ function TR(
215219
if k == 1
216220
@info @sprintf "%6d %8s %8.1e %8.1e" k "" fk hk
217221
elseif optimal
222+
#! format: off
218223
@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
219225
@info "TR: terminating with √ξ1 = $(sqrt(ξ1))"
220226
end
221227
end

0 commit comments

Comments
 (0)