changed the default variants, removed expand()

classical/mpliouville.py

@@ -361,7 +361,7 @@ class MPLPDR:
         R(Q) (variant='r') """
 
     numeric = {'tool': 'theano', 'modules': None}
-    def __init__(self, maxorder, system, numeric=None, variant='r', **kwargs):
+    def __init__(self, maxorder, system, numeric=None, variant='dr', **kwargs):
         """ modules supported by tool 'lambdify': math, mpmath, numpy,
             numexpr, tensorflow, sympy """
 
@@ -391,8 +391,8 @@ class MPLPDR:
         distl, distr = tee((f.r for f in self.ff))
         symdist = [sp.Symbol(str(dist.func), real=True) for dist in distr]
         repld.update(dict(zip(distl, symdist)))
-        ilnqbe = ((j.xreplace(repld).expand() for j in i) for i in ilnqbv)
-        ilnpbe = ((j.xreplace(repld).expand() for j in i) for i in ilnpbv)
+        ilnqbe = ((j.xreplace(repld) for j in i) for i in ilnqbv)
+        ilnpbe = ((j.xreplace(repld) for j in i) for i in ilnpbv)
 
         # explicit expressions of distance derivatives in r, Q symbols
         repldr = dict(zip((f.r for f in self.ff), symdist))
@@ -516,7 +516,7 @@ class MPLPDV:
         implementation; V(r) based cut-offs can be implemented. """
 
     numeric = {'tool': 'theano', 'modules': None}
-    def __init__(self, maxorder, system, numeric=None, variant='r', **kwargs):
+    def __init__(self, maxorder, system, numeric=None, variant='dv', **kwargs):
         """ modules supported by tool 'lambdify': math, mpmath, numpy,
             numexpr, tensorflow, sympy """