From: Vivien Maisonneuve Date: Wed, 20 Aug 2014 12:10:35 +0000 (+0200) Subject: Remove _repr_latex_() methods (current implementation not satisfying) X-Git-Tag: 1.0~4 X-Git-Url: https://scm.cri.mines-paristech.fr/git/linpy.git/commitdiff_plain/2b13a146860ac116ce0388d8f7551044c09c55f7?ds=inline;hp=6d08d8c0a84c1ffa31f5eb16e33b340727f46175 Remove _repr_latex_() methods (current implementation not satisfying) --- diff --git a/linpy/domains.py b/linpy/domains.py index 1f7a190..432e275 100644 --- a/linpy/domains.py +++ b/linpy/domains.py @@ -729,12 +729,6 @@ class Domain(GeometricObject): strings = [repr(polyhedron) for polyhedron in self.polyhedra] return 'Or({})'.format(', '.join(strings)) - def _repr_latex_(self): - strings = [] - for polyhedron in self.polyhedra: - strings.append('({})'.format(polyhedron._repr_latex_().strip('$'))) - return '${}$'.format(' \\vee '.join(strings)) - @classmethod def fromsympy(cls, expr): """ diff --git a/linpy/linexprs.py b/linpy/linexprs.py index eff4a7e..ee6e39e 100644 --- a/linpy/linexprs.py +++ b/linpy/linexprs.py @@ -377,30 +377,6 @@ class LinExpr: string += ' - {}'.format(-constant) return string - def _repr_latex_(self): - string = '' - for i, (symbol, coefficient) in enumerate(self.coefficients()): - if coefficient == 1: - if i != 0: - string += ' + ' - elif coefficient == -1: - string += '-' if i == 0 else ' - ' - elif i == 0: - string += '{}'.format(coefficient._repr_latex_().strip('$')) - elif coefficient > 0: - string += ' + {}'.format(coefficient._repr_latex_().strip('$')) - elif coefficient < 0: - string += ' - {}'.format((-coefficient)._repr_latex_().strip('$')) - string += '{}'.format(symbol._repr_latex_().strip('$')) - constant = self.constant - if len(string) == 0: - string += '{}'.format(constant._repr_latex_().strip('$')) - elif constant > 0: - string += ' + {}'.format(constant._repr_latex_().strip('$')) - elif constant < 0: - string += ' - {}'.format((-constant)._repr_latex_().strip('$')) - return '$${}$$'.format(string) - def _parenstr(self, always=False): string = str(self) if not always and (self.isconstant() or self.issymbol()): @@ -525,9 +501,6 @@ class Symbol(LinExpr): def __repr__(self): return self.name - def _repr_latex_(self): - return '$${}$$'.format(self.name) - def symbols(names): """ @@ -586,9 +559,6 @@ class Dummy(Symbol): def __repr__(self): return '_{}'.format(self.name) - def _repr_latex_(self): - return '$${}_{{{}}}$$'.format(self.name, self._index) - class Rational(LinExpr, Fraction): """ @@ -633,13 +603,3 @@ class Rational(LinExpr, Fraction): return '{!r}'.format(self.numerator) else: return '{!r}/{!r}'.format(self.numerator, self.denominator) - - def _repr_latex_(self): - if self.denominator == 1: - return '$${}$$'.format(self.numerator) - elif self.numerator < 0: - return '$$-\\frac{{{}}}{{{}}}$$'.format(-self.numerator, - self.denominator) - else: - return '$$\\frac{{{}}}{{{}}}$$'.format(self.numerator, - self.denominator) diff --git a/linpy/polyhedra.py b/linpy/polyhedra.py index f802151..c05432a 100644 --- a/linpy/polyhedra.py +++ b/linpy/polyhedra.py @@ -317,14 +317,6 @@ class Polyhedron(Domain): else: return 'And({})'.format(', '.join(strings)) - def _repr_latex_(self): - strings = [] - for equality in self.equalities: - strings.append('{} = 0'.format(equality._repr_latex_().strip('$'))) - for inequality in self.inequalities: - strings.append('{} \\ge 0'.format(inequality._repr_latex_().strip('$'))) - return '$${}$$'.format(' \\wedge '.join(strings)) - @classmethod def fromsympy(cls, expr): domain = Domain.fromsympy(expr) @@ -363,9 +355,6 @@ class EmptyType(Polyhedron): def __repr__(self): return 'Empty' - def _repr_latex_(self): - return '$$\\emptyset$$' - Empty = EmptyType() @@ -386,9 +375,6 @@ class UniverseType(Polyhedron): def __repr__(self): return 'Universe' - def _repr_latex_(self): - return '$$\\Omega$$' - Universe = UniverseType()