Skip to content

Commit fd6bc30

Browse files
committed
change constructors to use kwargs
1 parent dec345e commit fd6bc30

File tree

1 file changed

+43
-30
lines changed

1 file changed

+43
-30
lines changed

lib/NonlinearSolveBase/src/verbosity.jl

Lines changed: 43 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ mutable struct NonlinearErrorControlVerbosity
2828
jacobian_free::Verbosity.Type
2929
termination_condition::Verbosity.Type
3030

31-
function NonlinearErrorControlVerbosity(immutable_u0 = nonlinear_verbosity_defaults[:immutable_u0],
31+
function NonlinearErrorControlVerbosity(;immutable_u0 = nonlinear_verbosity_defaults[:immutable_u0],
3232
non_enclosing_interval = nonlinear_verbosity_defaults[:non_enclosing_interval],
3333
non_forward_mode = nonlinear_verbosity_defaults[:non_forward_mode],
3434
fd_ad_caution = nonlinear_verbosity_defaults[:fd_ad_caution],
@@ -40,21 +40,26 @@ mutable struct NonlinearErrorControlVerbosity
4040
new(immutable_u0, non_enclosing_interval, non_forward_mode, fd_ad_caution, ad_backend_incompatible,
4141
alias_u0_immutable, linsolve_failed_noncurrent, jacobian_free, termination_condition)
4242
end
43+
4344
end
4445

4546
function NonlinearErrorControlVerbosity(verbose::Verbosity.Type)
4647
@match verbose begin
47-
Verbosity.None() => NonlinearErrorControlVerbosity(fill(
48-
Verbosity.None(), length(fieldnames(NonlinearErrorControlVerbosity)))...)
48+
Verbosity.None() => NonlinearErrorControlVerbosity(;NamedTuple{fieldnames(NonlinearErrorControlVerbosity)}(fill(
49+
Verbosity.None(),
50+
length(fieldnames(NonlinearErrorControlVerbosity))))...)
4951

50-
Verbosity.Info() => NonlinearErrorControlVerbosity(fill(
51-
Verbosity.Info(), length(fieldnames(NonlinearErrorControlVerbosity)))...)
52+
Verbosity.Info() => NonlinearErrorControlVerbosity(;NamedTuple{fieldnames(NonlinearErrorControlVerbosity)}(fill(
53+
Verbosity.Info(),
54+
length(fieldnames(NonlinearErrorControlVerbosity))))...)
5255

53-
Verbosity.Warn() => NonlinearErrorControlVerbosity(fill(
54-
Verbosity.Warn(), length(fieldnames(NonlinearErrorControlVerbosity)))...)
56+
Verbosity.Warn() => NonlinearErrorControlVerbosity(;NamedTuple{fieldnames(NonlinearErrorControlVerbosity)}(fill(
57+
Verbosity.Warn(),
58+
length(fieldnames(NonlinearErrorControlVerbosity))))...)
5559

56-
Verbosity.Error() => NonlinearErrorControlVerbosity(fill(
57-
Verbosity.Error(), length(fieldnames(NonlinearErrorControlVerbosity)))...)
60+
Verbosity.Error() => NonlinearErrorControlVerbosity(;NamedTuple{fieldnames(NonlinearErrorControlVerbosity)}(fill(
61+
Verbosity.Error(),
62+
length(fieldnames(NonlinearErrorControlVerbosity))))...)
5863

5964
Verbosity.Default() => NonlinearErrorControlVerbosity()
6065

@@ -70,27 +75,31 @@ mutable struct NonlinearPerformanceVerbosity
7075
sparsity_using_jac_prototype::Verbosity.Type
7176
sparse_matrixcolorings_not_loaded::Verbosity.Type
7277

73-
function NonlinearPerformanceVerbosity(colorvec_non_sparse = nonlinear_verbosity_defaults[:colorvec_non_sparse],
74-
colorvec_no_prototype = nonlinear_verbosity_defaults[:colorvec_no_prototype],
75-
sparsity_using_jac_prototype = nonlinear_verbosity_defaults[:sparsity_using_jac_prototype],
76-
sparse_matrixcolorings_not_loaded = nonlinear_verbosity_defaults[:sparse_matrixcolorings_not_loaded])
78+
function NonlinearPerformanceVerbosity(; colorvec_non_sparse=nonlinear_verbosity_defaults[:colorvec_non_sparse],
79+
colorvec_no_prototype=nonlinear_verbosity_defaults[:colorvec_no_prototype],
80+
sparsity_using_jac_prototype=nonlinear_verbosity_defaults[:sparsity_using_jac_prototype],
81+
sparse_matrixcolorings_not_loaded=nonlinear_verbosity_defaults[:sparse_matrixcolorings_not_loaded])
7782
new(colorvec_non_sparse, colorvec_no_prototype, sparsity_using_jac_prototype, sparse_matrixcolorings_not_loaded)
7883
end
7984
end
8085

8186
function NonlinearPerformanceVerbosity(verbose::Verbosity.Type)
8287
@match verbose begin
83-
Verbosity.None() => NonlinearPerformanceVerbosity(fill(
84-
Verbosity.None(), length(fieldnames(NonlinearPerformanceVerbosity)))...)
88+
Verbosity.None() => NonlinearPerformanceVerbosity(;NamedTuple{fieldnames(NonlinearPerformanceVerbosity)}(fill(
89+
Verbosity.None(),
90+
length(fieldnames(NonlinearPerformanceVerbosity))))...)
8591

86-
Verbosity.Info() => NonlinearPerformanceVerbosity(fill(
87-
Verbosity.Info(), length(fieldnames(NonlinearPerformanceVerbosity)))...)
92+
Verbosity.Info() => NonlinearPerformanceVerbosity(;NamedTuple{fieldnames(NonlinearPerformanceVerbosity)}(fill(
93+
Verbosity.Info(),
94+
length(fieldnames(NonlinearPerformanceVerbosity))))...)
8895

89-
Verbosity.Warn() => NonlinearPerformanceVerbosity(fill(
90-
Verbosity.Warn(), length(fieldnames(NonlinearPerformanceVerbosity)))...)
96+
Verbosity.Warn() => NonlinearPerformanceVerbosity(;NamedTuple{fieldnames(NonlinearPerformanceVerbosity)}(fill(
97+
Verbosity.Warn(),
98+
length(fieldnames(NonlinearPerformanceVerbosity))))...)
9199

92-
Verbosity.Error() => NonlinearPerformanceVerbosity(fill(
93-
Verbosity.Error(), length(fieldnames(NonlinearPerformanceVerbosity)))...)
100+
Verbosity.Error() => NonlinearPerformanceVerbosity(;NamedTuple{fieldnames(NonlinearPerformanceVerbosity)}(fill(
101+
Verbosity.Error(),
102+
length(fieldnames(NonlinearPerformanceVerbosity))))...)
94103

95104
Verbosity.Default() => NonlinearPerformanceVerbosity()
96105

@@ -103,7 +112,7 @@ end
103112
mutable struct NonlinearNumericalVerbosity
104113
threshold_state::Verbosity.Type
105114
pinv_undefined::Verbosity.Type
106-
function NonlinearNumericalVerbosity(
115+
function NonlinearNumericalVerbosity(;
107116
threshold_state = nonlinear_verbosity_defaults[:threshold_state],
108117
pinv_undefined = nonlinear_verbosity_defaults[:pinv_undefined])
109118
new(threshold_state, pinv_undefined)
@@ -112,17 +121,21 @@ end
112121

113122
function NonlinearNumericalVerbosity(verbose::Verbosity.Type)
114123
@match verbose begin
115-
Verbosity.None() => NonlinearNumericalVerbosity(fill(
116-
Verbosity.None(), length(fieldnames(NonlinearNumericalVerbosity)))...)
124+
Verbosity.None() => NonlinearNumericalVerbosity(;NamedTuple{fieldnames(NonlinearNumericalVerbosity)}(fill(Verbosity.None(),
125+
length(fieldnames(NonlinearNumericalVerbosity))))...)
126+
117127

118-
Verbosity.Info() => NonlinearNumericalVerbosity(fill(
119-
Verbosity.Info(), length(fieldnames(NonlinearNumericalVerbosity)))...)
128+
Verbosity.Info() => NonlinearNumericalVerbosity(;NamedTuple{fieldnames(NonlinearNumericalVerbosity)}(fill(
129+
Verbosity.Info(),
130+
length(fieldnames(NonlinearNumericalVerbosity))))...)
120131

121-
Verbosity.Warn() => NonlinearNumericalVerbosity(fill(
122-
Verbosity.Warn(), length(fieldnames(NonlinearNumericalVerbosity)))...)
132+
Verbosity.Warn() => NonlinearNumericalVerbosity(;NamedTuple{fieldnames(NonlinearNumericalVerbosity)}(fill(
133+
Verbosity.Warn(),
134+
length(fieldnames(NonlinearNumericalVerbosity))))...)
123135

124-
Verbosity.Error() => NonlinearNumericalVerbosity(fill(
125-
Verbosity.Error(), length(fieldnames(NonlinearNumericalVerbosity)))...)
136+
Verbosity.Error() => NonlinearNumericalVerbosity(;NamedTuple{fieldnames(NonlinearNumericalVerbosity)}(fill(
137+
Verbosity.Error(),
138+
length(fieldnames(NonlinearNumericalVerbosity))))...)
126139

127140
Verbosity.Default() => NonlinearNumericalVerbosity()
128141

0 commit comments

Comments
 (0)