Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
Merge branch 'u/vdelecroix/18357' #18357
Browse files Browse the repository at this point in the history
  • Loading branch information
@vbraun
vbraun committed May 16, 2015
2 parents e41f4f6 + 7616a94 commit 26e6221
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 15 deletions.
32 changes: 28 additions & 4 deletions src/sage/combinat/dyck_word.py
View file
Expand Up @@ -614,6 +614,20 @@ def _ascii_art_(self):
ret = self._repr_lattice()
return AsciiArt(ret.splitlines(), baseline=0)

def _unicode_art_(self):
r"""
Return an unicode art representation of this Dyck word.
EXAMPLES::
sage: unicode_art(list(DyckWords(3)))
⎡ ╱╲ ⎤
⎢ ╱╲ ╱╲ ╱╲╱╲ ╱ ╲ ⎥
⎣ ╱╲╱╲╱╲, ╱╲╱ ╲, ╱ ╲╱╲, ╱ ╲, ╱ ╲ ⎦
"""
from sage.typeset.unicode_art import UnicodeArt
return UnicodeArt(self.to_path_string(unicode=True).splitlines())

def __str__(self):
r"""
Return a string consisting of matched parentheses corresponding to
Expand All @@ -631,7 +645,7 @@ def __str__(self):
else:
return "".join(map(replace_symbols, [x for x in self]))

def to_path_string(self):
def to_path_string(self, unicode=False):
r"""
A path representation of the Dyck word consisting of steps
``/`` and ``\`` .
Expand All @@ -648,15 +662,25 @@ def to_path_string(self):
/\/ \/\/\
/ \
"""
res = [([" "]*len(self)) for _ in range(self.height())]
if unicode:
import unicodedata
space = u' '
up = unicodedata.lookup('BOX DRAWINGS LIGHT DIAGONAL UPPER RIGHT TO LOWER LEFT')
down = unicodedata.lookup('BOX DRAWINGS LIGHT DIAGONAL UPPER LEFT TO LOWER RIGHT')
else:
space = ' '
up = '/'
down = '\\'

res = [([space]*len(self)) for _ in range(self.height())]
h = 1
for i, p in enumerate(self):
if p == open_symbol:
res[-h][i] = "/"
res[-h][i] = up
h += 1
else:
h -= 1
res[-h][i] = "\\"
res[-h][i] = down
return "\n".join("".join(l) for l in res)

def pretty_print(self, type=None, labelling=None, underpath=True):
Expand Down
111 changes: 100 additions & 11 deletions src/sage/combinat/tableau.py
View file
Expand Up @@ -519,9 +519,28 @@ def _ascii_art_(self):
from sage.misc.ascii_art import AsciiArt
return AsciiArt(ascii.splitlines())

def _unicode_art_(self):
r"""
TESTS::
sage: unicode_art(Tableau([[1,2,3],[4],[5]]))
┌───┬───┬───┐
│ 1 │ 2 │ 3 │
├───┼───┴───┘
│ 4 │
├───┤
│ 5 │
└───┘
sage: unicode_art(Tableau([]))
┌┐
└┘
"""
from sage.typeset.unicode_art import UnicodeArt
return UnicodeArt(self._ascii_art_table(unicode=True).splitlines())

_ascii_art_repr = _repr_diagram

def _ascii_art_table(self):
def _ascii_art_table(self, unicode=False):
"""
TESTS:
Expand Down Expand Up @@ -578,9 +597,54 @@ def _ascii_art_table(self):
| 1 | 2 | 15 | 7 |
+----+----+----+---+
sage: Tableaux.global_options.reset()
Unicode version::
sage: t = Tableau([[1,2,15,7],[12,5],[8,10],[9]])
sage: print t._ascii_art_table(unicode=True)
┌────┬────┬────┬───┐
│ 1 │ 2 │ 15 │ 7 │
├────┼────┼────┴───┘
│ 12 │ 5 │
├────┼────┤
│ 8 │ 10 │
├────┼────┘
│ 9 │
└────┘
sage: Tableaux().global_options(convention='french')
sage: t = Tableau([[1,2,15,7],[12,5],[8,10],[9]])
sage: print t._ascii_art_table(unicode=True)
┌────┐
│ 9 │
├────┼────┐
│ 8 │ 10 │
├────┼────┤
│ 12 │ 5 │
├────┼────┼────┬───┐
│ 1 │ 2 │ 15 │ 7 │
└────┴────┴────┴───┘
sage: Tableaux.global_options.reset()
"""
if unicode:
import unicodedata
v = unicodedata.lookup('BOX DRAWINGS LIGHT VERTICAL')
h = unicodedata.lookup('BOX DRAWINGS LIGHT HORIZONTAL')
dl = unicodedata.lookup('BOX DRAWINGS LIGHT DOWN AND LEFT')
dr = unicodedata.lookup('BOX DRAWINGS LIGHT DOWN AND RIGHT')
ul = unicodedata.lookup('BOX DRAWINGS LIGHT UP AND LEFT')
ur = unicodedata.lookup('BOX DRAWINGS LIGHT UP AND RIGHT')
vr = unicodedata.lookup('BOX DRAWINGS LIGHT VERTICAL AND RIGHT')
vl = unicodedata.lookup('BOX DRAWINGS LIGHT VERTICAL AND LEFT')
uh = unicodedata.lookup('BOX DRAWINGS LIGHT UP AND HORIZONTAL')
dh = unicodedata.lookup('BOX DRAWINGS LIGHT DOWN AND HORIZONTAL')
vh = unicodedata.lookup('BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL')
else:
v = '|'
h = '-'
dl = dr = ul = ur = vr = vl = uh = dh = vh = '+'

if len(self) == 0:
return "++\n++"
return dr + dl + '\n' + ur + ul

# Get the widths of the columns
str_tab = map(lambda row: map(str, row), self)
Expand All @@ -591,22 +655,47 @@ def _ascii_art_table(self):

matr = [] # just the list of lines
l1 = ""
for w in col_widths:
l1 += "+--" + '-'*w
matr.append(l1 + "+")
for row in str_tab:
l1 += dr + h*(2+col_widths[0])
for w in col_widths[1:]:
l1 += dh + h + h + h*w
matr.append(l1 + dl)
for nrow,row in enumerate(str_tab):
l1 = ""; l2 = ""
for i,e in enumerate(row):
l1 += "+--" + '-'*col_widths[i]
l2 += "| {:^{width}} ".format(e, width=col_widths[i])
l1 += "+"; l2 += "|"
n = len(str_tab[nrow+1]) if nrow+1 < len(str_tab) else 0
for i,(e,w) in enumerate(zip(row,col_widths)):
if i == 0:
if n:
l1 += vr + h*(2+w)
else:
l1 += ur + h*(2+w)
elif i <= n:
l1 += vh + h*(2+w)
else:
l1 += uh + h*(2+w)
if unicode:
l2 += u"{} {:^{width}} ".format(v, e, width=w)
else:
l2 += "{} {:^{width}} ".format(v, e, width=w)
if i+1 <= n:
l1 += vl
else:
l1 += ul
l2 += v
matr.append(l2)
matr.append(l1)

if self.parent().global_options('convention') == "English":
return "\n".join(matr)
else:
return "\n".join(reversed(matr))
output = "\n".join(reversed(matr))
if unicode:
tr = {
ord(dl): ul, ord(dr): ur,
ord(ul): dl, ord(ur): dr,
ord(dh): uh, ord(uh): dh}
return output.translate(tr)
else:
return output

def _ascii_art_compact(self):
"""
Expand Down

0 comments on commit 26e6221

Please sign in to comment.