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

Commit

Permalink
Ticket 14103: please load 14104 in the git repository
Browse files Browse the repository at this point in the history
  • Loading branch information
elixyre committed Jul 12, 2014
1 parent 96201fd commit b0f5503
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions src/sage/matrix/labelled_matrix.py
Expand Up @@ -233,20 +233,14 @@ class :class:`LabelledMatrix` allows two dimensional arrays to be indexed
from sage.categories.modules_with_basis import ModulesWithBasis
from sage.categories.rings import Rings
from sage.categories.sets_cat import Sets
from sage.combinat.combinat import CombinatorialObject
from sage.graphs.graph import Graph
from sage.interfaces.html_display import HTMLDisplay, HTMLTable
from sage.matrix.constructor import matrix
from sage.misc.classcall_metaclass import ClasscallMetaclass
from sage.misc.flatten import flatten
from sage.misc.latex import latex
from sage.misc.lazy_attribute import lazy_attribute
from sage.rings.integer import Integer
from sage.rings.integer_ring import ZZ
from sage.rings.semirings.non_negative_integer_semiring import NN
from sage.sets.family import LazyFamily
from sage.structure.element import is_Element, is_Matrix
from sage.structure.parent import Parent
from sage.structure.sage_object import SageObject


Expand Down Expand Up @@ -844,9 +838,9 @@ def _html_display(self, filename, url_include):
This is a dummy function which caches the html table being constructed
by the matrix.
"""
if not hasattr(self, '__html_display'):
self.__html_display=HTMLDisplay(title=self._name, html_file=filename, url_include=url_include)
return self.__html_display
#if not hasattr(self, '__html_display'):
# self.__html_display=HTMLDisplay(title=self._name, html_file=filename, url_include=url_include)
#return self.__html_display


def _html_table(self):
Expand Down Expand Up @@ -901,11 +895,11 @@ def _html_table(self):
else:
table[row].append('{}'.format(self[row][col]))

return HTMLTable(table=table, col_label=col_label, row_label=row_label,
col_label_math_mode=self._col_label_math_mode,
row_label_math_mode=self._row_label_math_mode,
entries_math_mode=False # already taken care of
)
#return HTMLTable(table=table, col_label=col_label, row_label=row_label,
# col_label_math_mode=self._col_label_math_mode,
# row_label_math_mode=self._row_label_math_mode,
# entries_math_mode=False # already taken care of
# )


def html_display(self, filename=None, url_include=None):
Expand Down

0 comments on commit b0f5503

Please sign in to comment.