eja: speed up _all2list().

[sage.d.git] / mjo / eja / eja_utils.py

diff --git a/mjo/eja/eja_utils.py b/mjo/eja/eja_utils.py
index 3942e70811c6d69e59c9581d23f17af05c261dfa..a4328610e5e41db689455828bd0d8988225e745b 100644 (file)
--- a/mjo/eja/eja_utils.py
+++ b/mjo/eja/eja_utils.py
@@ -1,4 +1,5 @@
 from sage.functions.other import sqrt
+from sage.structure.element import is_Matrix
 from sage.matrix.constructor import matrix
 from sage.modules.free_module_element import vector
 
@@ -10,14 +11,16 @@ def _charpoly_sage_input(s):
 
     SETUP::
 
+        sage: from mjo.eja.eja_algebra import JordanSpinEJA
         sage: from mjo.eja.eja_utils import _charpoly_sage_input
 
     EXAMPLES::
 
         sage: J = JordanSpinEJA(4,QQ)
-        sage: J._charpoly_coefficients()[0]
+        sage: a = J._charpoly_coefficients()
+        sage: a[0]
         X1^2 - X2^2 - X3^2 - X4^2
-        sage: _charpoly_sage_input("X1^2 - X2^2 - X3^2 - X4^2")
+        sage: _charpoly_sage_input(str(a[0]))
         'X[0]**2 - X[1]**2 - X[2]**2 - X[3]**2'
 
     """
@@ -145,9 +148,16 @@ def _all2list(x):
         # first needing to convert them to a list of octonions and
         # then recursing down into the list. It also avoids the wonky
         # list(x) when x is an element of a CFM. I don't know what it
-        # returns but it aint the coordinates. This will fall through
-        # to the iterable case the next time around.
-        return _all2list(x.to_vector())
+        # returns but it aint the coordinates. We don't recurse
+        # because vectors can only contain ring elements as entries.
+        return x.to_vector().list()
+
+    if is_Matrix(x):
+        # This sucks, but for performance reasons we don't want to
+        # call _all2list recursively on the contents of a matrix
+        # when we don't have to (they only contain ring elements
+        # as entries)
+        return x.list()
 
     try:
         xl = list(x)
@@ -158,7 +168,7 @@ def _all2list(x):
         # Avoid the retardation of list(QQ(1)) == [1].
         return [x]
 
-    return sum(list( map(_all2list, xl) ), [])
+    return sum( map(_all2list, xl) , [])