Merge pull request #273 from eric-wieser/use-sympy-printer-hooks

Use the builtin hooks in sympy printers

Author: utensil

galgebra/dop.py

@@ -116,7 +116,7 @@ def _with_sorted_terms(self):
         new_terms = sorted(self.terms, key=lambda term: Pdop.sort_key(term[1]))
         return Sdop(new_terms)
 
-    def Sdop_str(self, print_obj):
+    def _sympystr(self, print_obj):
         if len(self.terms) == 0:
             return ZERO_STR
 
@@ -144,7 +144,7 @@ def Sdop_str(self, print_obj):
                 s = '(' + s + ')'
         return s
 
-    def Sdop_latex_str(self, print_obj):
+    def _latex(self, print_obj):
         if len(self.terms) == 0:
             return ZERO_STR
 
@@ -378,7 +378,7 @@ def __rmul__(self, other):  # functional product of arg and self (arg*self)
         assert not isinstance(other, Pdop)
         return Sdop([(other, self)])
 
-    def Pdop_str(self, print_obj):
+    def _sympystr(self, print_obj):
         if self.order == 0:
             return 'D{}'
         s = 'D'
@@ -389,7 +389,7 @@ def Pdop_str(self, print_obj):
                 s += '^' + print_obj.doprint(n)
         return s
 
-    def Pdop_latex_str(self, print_obj):
+    def _latex(self, print_obj):
         if self.order == 0:
             return ''
         s = r'\frac{\partial'

galgebra/lt.py

@@ -389,7 +389,7 @@ def inv(self):
             raise ValueError('Lt inverse currently implemented only for spinor!\n')
         return Lt_inv
 
-    def Lt_str(self, print_obj):
+    def _sympystr(self, print_obj):
 
         if self.spinor:
             return 'R = ' + print_obj.doprint(self.R)
@@ -403,7 +403,7 @@ def Lt_str(self, print_obj):
                     s += pre + print_obj.doprint(base) + ') = 0\n'
             return s[:-1]
 
-    def Lt_latex_str(self, print_obj):
+    def _latex(self, print_obj):
 
         if self.spinor:
             s = '\\left \\{ \\begin{array}{ll} '
@@ -586,10 +586,10 @@ def extact_basis_indexes(Ga):
                 base_indexes.append(base_str[i:])
         return base_indexes
 
-    def Mlt_str(self, print_obj):
+    def _sympystr(self, print_obj):
         return print_obj.doprint(self.fvalue)
 
-    def Mlt_latex_str(self, print_obj):
+    def _latex(self, print_obj):
         if self.nargs <= 1:
             return print_obj.doprint(self.fvalue)
         expr_lst = Mlt.expand_expr(self.fvalue, self.Ga)

galgebra/mv.py

@@ -583,7 +583,7 @@ def __getitem__(self, key):
         '''
         return self.grade(key)
 
-    def Mv_str(self, print_obj):
+    def _sympystr(self, print_obj):
         if self.obj == S.Zero:
             return ZERO_STR
 
@@ -653,7 +653,7 @@ def Mv_str(self, print_obj):
         else:
             return print_obj.doprint(self.obj)
 
-    def Mv_latex_str(self, print_obj):
+    def _latex(self, print_obj):
 
         if self.obj == S.Zero:
             return ZERO_STR
@@ -1718,7 +1718,7 @@ def Dop_mv_expand(self, modes=None):
         terms = list(zip(coefs, bases))
         return sorted(terms, key=lambda x: self.Ga.blades.flat.index(x[1]))
 
-    def Dop_str(self, print_obj):
+    def _sympystr(self, print_obj):
         if len(self.terms) == 0:
             return ZERO_STR
 
@@ -1752,7 +1752,7 @@ def Dop_str(self, print_obj):
         s = s.replace('+ -', '-')
         return s[:-3]
 
-    def Dop_latex_str(self, print_obj):
+    def _latex(self, print_obj):
         if len(self.terms) == 0:
             return ZERO_STR
 

galgebra/printer.py

@@ -370,24 +370,6 @@ def _print_Matrix(self, expr):
         out_str = ostr(list(expr))
         return out_str
 
-    def _print_Mv(self, expr):
-        return expr.Mv_str(self)
-
-    def _print_Pdop(self, expr):
-        return expr.Pdop_str(self)
-
-    def _print_Dop(self, expr):
-        return expr.Dop_str(self)
-
-    def _print_Sdop(self, expr):
-        return expr.Sdop_str(self)
-
-    def _print_Lt(self, expr):
-        return expr.Lt_str(self)
-
-    def _print_Mlt(self, expr):
-        return expr.Mlt_str(self)
-
 
 Basic.__ga_print_str__ = lambda self: GaPrinter().doprint(self)
 Matrix.__ga_print_str__ = lambda self: GaPrinter().doprint(self)
@@ -933,24 +915,6 @@ def _print_Derivative(self, expr):
             s = r"%s %s" % (tex, self._print(expr.expr))
         return s
 
-    def _print_Mv(self, expr):
-        return expr.Mv_latex_str(self)
-
-    def _print_Pdop(self, expr):
-        return expr.Pdop_latex_str(self)
-
-    def _print_Dop(self, expr):
-        return expr.Dop_latex_str(self)
-
-    def _print_Sdop(self, expr):
-        return expr.Sdop_latex_str(self)
-
-    def _print_Lt(self, expr):
-        return expr.Lt_latex_str(self)
-
-    def _print_Mlt(self, expr):
-        return expr.Mlt_latex_str(self)
-
     def _print_MatrixBase(self, expr):
         rows = expr.rows
         cols = expr.cols