added lambdify and theano to MPLPQP class

rotagaporp/mpliouville.py

@@ -201,20 +201,52 @@ class MPLPQP:
             self.numeric = numeric
         elif hasattr(system, 'numeric'):
             self.numeric = system.numeric
-        assert self.numeric['tool'] == 'subs'
         self.ilnqobj = MPLP(nterms, system.hamiltonian, system.q, system.p,
                             function=system.q, **kwargs)
         self.ilnpobj = MPLP(nterms, system.hamiltonian, system.q, system.p,
                             function=system.p, **kwargs)
-        self.ilnqexpr = self.ilnqobj.Lf
-        self.ilnpexpr = self.ilnpobj.Lf
+        self.ilnqcart = self.ilnqobj.Lf
+        self.ilnpcart = self.ilnpobj.Lf
+        self.set_eval_func((*system.q, *system.p))
 
-    def get_val_float(self, qval, pval):
+    def set_eval_func(self, symbs):
+        """ compile functions to evaluate expressions numerically """
+
+        if self.numeric['tool'] == 'subs':
+            self.get_val_float = self.get_val_subs
+        elif self.numeric['tool'] == 'lambdify':
+            backend = self.numeric['modules']
+            self.ilnqtf = [lambdify(symbs, i, backend) for i in self.ilnqcart]
+            self.ilnptf = [lambdify(symbs, i, backend) for i in self.ilnpcart]
+            self.get_val_float = self.get_val_lambdify
+        elif self.numeric['tool'] == 'theano':
+            from sympy.printing.theanocode import theano_function as tf
+            tf_params = {'on_unused_input': 'ignore'}
+            self.ilnqtf = [tf(symbs, i, **tf_params) for i in self.ilnqcart]
+            self.ilnptf = [tf(symbs, i, **tf_params) for i in self.ilnpcart]
+            self.get_val_float = self.get_val_theano
+        else:
+            raise ValueError('not supported numeric: '+self.numeric['tool'])
+
+    def get_val_subs(self, qval, pval):
         """ evaluates (iL)^n q and (iL)^n p for given values of q and p """
         qvec = self.ilnqobj.get_val_float(qval, pval)
         pvec = self.ilnpobj.get_val_float(qval, pval)
         return (qvec, pvec)
 
+    def get_val_lambdify(self, qval, pval):
+        """ evaluates (iL)^n q and (iL)^n p for given values of q and p """
+        replvec = (*qval, *pval)
+        ilnqtv = [tf(replvec) for tf in self.ilnqtf]
+        ilnptv = [tf(replvec) for tf in self.ilnptf]
+        return (ilnqtv, ilnptv)
+
+    def get_val_theano(self, qval, pval):
+        """ evaluates (iL)^n q and (iL)^n p for given values of q and p """
+        ilnqtv = [tf(*qval, *pval) for tf in self.ilnqtf]
+        ilnptv = [tf(*qval, *pval) for tf in self.ilnptf]
+        return (ilnqtv, ilnptv)
+
 
 class MPLPAQ(MPLP):
     """ assume H(Q, P) = V(Q) + T(P) and functions Q and P. The iL^n f

tests/mp_tests.py

@@ -56,6 +56,8 @@ class MPLPTest(unittest.TestCase):
 
         cases = (
             (MPLPQP, None, {'tool': 'subs'}),
+            (MPLPQP, None, {'tool': 'theano'}),
+            (MPLPQP, None, {'tool': 'lambdify', 'modules': 'math'}),
             (MPLPAQ, None, {'tool': 'subs'}),
             (MPLPAQ, None, {'tool': 'theano'}),
             (MPLPAQ, None, {'tool': 'lambdify', 'modules': 'math'}),