Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: better performance for labelled matrix display #3602

Merged
merged 3 commits into from
Apr 12, 2024
Merged

fix: better performance for labelled matrix display #3602

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd6c066
fix: better performance for labelled matrix display
thofma Apr 12, 2024
54b4f0f
Update src/Groups/MatrixDisplay.jl
thofma Apr 12, 2024
9376127
Update src/Groups/MatrixDisplay.jl
thofma Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/Groups/MatrixDisplay.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ mylpad(s::String,n::Int) = " "^(n-textwidth(s))*s
const superscript = Dict(zip("-0123456789", "⁻⁰¹²³⁴⁵⁶⁷⁸⁹"))
const subscript = Dict(zip("-0123456789", "₋₀₁₂₃₄₅₆₇₈₉"))

function replace_TeX(str::String)
if Oscar.is_unicode_allowed()
function replace_TeX(str::String; is_unicode_allowed = Oscar.is_unicode_allowed())
if is_unicode_allowed
str = replace(str, "\\chi" => "χ")
str = replace(str, "\\phi" => "φ")
str = replace(str, "\\varphi" => "φ")
Expand Down Expand Up @@ -250,21 +250,24 @@ function labeled_matrix_formatted(io::IO, mat::Matrix{String})
if ! TeX
# If no `TeX` output is required then
# replace markup in the matrices, ...
leftpart = map(replace_TeX, leftpart)
rightpart = map(replace_TeX, rightpart)
with_unicode = Oscar.is_unicode_allowed()
leftpart = map(x -> replace_TeX(x, is_unicode_allowed = with_unicode), leftpart)
rightpart = map(x -> replace_TeX(x, is_unicode_allowed = with_unicode), rightpart)

header = map(replace_TeX, header)
footer = map(replace_TeX, footer)

# ... compute columns widths of the corner entries and row labels ...
leftwidth = map(textwidth, leftpart)
leftrows = [leftwidth[i,:] for i in 1:m]
widths_leftpart = map(max, leftrows...)
#widths_leftpart = map(max, leftrows...)
lgoettgens marked this conversation as resolved.
Show resolved Hide resolved
thofma marked this conversation as resolved.
Show resolved Hide resolved
widths_leftpart = [maximum(f[i] for f in leftrows; init = 0) for i in 1:length(first(leftrows))]

thofma marked this conversation as resolved.
Show resolved Hide resolved

# ... and of the column labels and matrix entries.
rightwidth = map(textwidth, rightpart)
rightrows = [rightwidth[i,:] for i in 1:m]
widths_rightpart = map(max, rightrows...)
widths_rightpart = [maximum(f[i] for f in rightrows; init = 0) for i in 1:length(first(rightrows))]

# Compute the width of the row labels part.
leftwidthsum = sum(widths_leftpart) + length(widths_leftpart) - 1
Expand Down
Loading