Skip to content

Commit b7398ed

Browse files
update to PrettyTable v3
1 parent ead681f commit b7398ed

3 files changed

Lines changed: 19 additions & 19 deletions

File tree

Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ LineSearches = "7"
3737
NLSolversBase = "7"
3838
NLopt = "0.6, 1"
3939
Optim = "1"
40-
PrettyTables = "2"
40+
PrettyTables = "3"
4141
ProximalAlgorithms = "0.7"
4242
StatsBase = "0.33, 0.34"
4343
Symbolics = "4, 5, 6"

src/frontend/fit/summary.jl

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ function details(
114114
print("\n")
115115
pretty_table(
116116
loading_array;
117-
header = header_cols,
118-
tf = PrettyTables.tf_borderless,
117+
column_labels = header_cols,
118+
table_format = TextTableFormat(borders = text_table_borders__borderless),
119119
alignment = :l,
120-
formatters = (v, i, j) -> isa(v, Number) && isnan(v) ? "" : v,
120+
formatters = [(v, i, j) -> isa(v, Number) && isnan(v) ? "" : v],
121121
)
122122
print("\n")
123123
end
@@ -152,10 +152,10 @@ function details(
152152
print("\n")
153153
pretty_table(
154154
regression_array;
155-
header = regression_columns,
156-
tf = PrettyTables.tf_borderless,
155+
column_labels = regression_columns,
156+
table_format = TextTableFormat(borders = text_table_borders__borderless),
157157
alignment = :l,
158-
formatters = (v, i, j) -> isa(v, Number) && isnan(v) ? "" : v,
158+
formatters = [(v, i, j) -> isa(v, Number) && isnan(v) ? "" : v],
159159
)
160160
print("\n")
161161

@@ -179,10 +179,10 @@ function details(
179179
print("\n")
180180
pretty_table(
181181
var_array;
182-
header = var_columns,
183-
tf = PrettyTables.tf_borderless,
182+
column_labels = var_columns,
183+
table_format = TextTableFormat(borders = text_table_borders__borderless),
184184
alignment = :l,
185-
formatters = (v, i, j) -> isa(v, Number) && isnan(v) ? "" : v,
185+
formatters = [(v, i, j) -> isa(v, Number) && isnan(v) ? "" : v],
186186
)
187187
print("\n")
188188

@@ -206,10 +206,10 @@ function details(
206206
print("\n")
207207
pretty_table(
208208
covar_array;
209-
header = covar_columns,
210-
tf = PrettyTables.tf_borderless,
209+
column_labels = covar_columns,
210+
table_format = TextTableFormat(borders = text_table_borders__borderless),
211211
alignment = :l,
212-
formatters = (v, i, j) -> isa(v, Number) && isnan(v) ? "" : v,
212+
formatters = [(v, i, j) -> isa(v, Number) && isnan(v) ? "" : v],
213213
)
214214
print("\n")
215215

@@ -236,10 +236,10 @@ function details(
236236
print("\n")
237237
pretty_table(
238238
mean_array;
239-
header = mean_columns,
240-
tf = PrettyTables.tf_borderless,
239+
column_labels = mean_columns,
240+
table_format = TextTableFormat(borders = text_table_borders__borderless),
241241
alignment = :l,
242-
formatters = (v, i, j) -> isa(v, Number) && isnan(v) ? "" : v,
242+
formatters = [(v, i, j) -> isa(v, Number) && isnan(v) ? "" : v],
243243
)
244244
print("\n")
245245
end

src/frontend/specification/ParameterTable.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,10 @@ function Base.show(io::IO, partable::ParameterTable)
114114
pretty_table(
115115
io,
116116
as_matrix,
117-
header = (shown_columns, [eltype(partable.columns[col]) for col in shown_columns]),
118-
tf = PrettyTables.tf_compact,
117+
column_labels = [shown_columns, [eltype(partable.columns[col]) for col in shown_columns]],
118+
table_format = TextTableFormat(borders = text_table_borders__compact),
119119
# TODO switch to `missing` as non-specified values and suppress printing of `missing` instead
120-
formatters = (v, i, j) -> isa(v, Number) && isnan(v) ? "" : v,
120+
formatters = [(v, i, j) -> isa(v, Number) && isnan(v) ? "" : v],
121121
)
122122

123123
print(io, "Latent Variables: $(partable.latent_vars) \n")

0 commit comments

Comments
 (0)