X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=mjo%2Feja%2Feja_utils.py;h=1e10943e6ee686a015b45f2f1592efca3323e705;hb=8fd6cc17cd935e5537bcea3aed8892c3ca65b40d;hp=6f8cab6d8019dcbba0be1e81c3872a7ba738f807;hpb=a46720db62543983ab375654dee211ca844ac46c;p=sage.d.git

diff --git a/mjo/eja/eja_utils.py b/mjo/eja/eja_utils.py
index 6f8cab6..1e10943 100644
--- a/mjo/eja/eja_utils.py
+++ b/mjo/eja/eja_utils.py
@@ -1,6 +1,4 @@
-from sage.functions.other import sqrt
-from sage.matrix.constructor import matrix
-from sage.modules.free_module_element import vector
+from sage.structure.element import is_Matrix
 
 def _scale(x, alpha):
     r"""
@@ -106,21 +104,21 @@ def _all2list(x):
         [3, 4, 1, 0, 0, 0, 0, 0, 0, 0]
 
     """
-    if hasattr(x, 'list') and hasattr(x, 'to_vector'):
-        # This avoids calling to_vector() on a matrix algebra with
-        # e.g. quaternions where the returned vector is of the wrong
-        # length (three instead of four) because the quaternions don't
-        # know how many generators they have.
-        return _all2list(x.list())
-
     if hasattr(x, 'to_vector'):
         # This works on matrices of e.g. octonions directly, without
         # 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)
@@ -131,15 +129,8 @@ def _all2list(x):
         # Avoid the retardation of list(QQ(1)) == [1].
         return [x]
 
-    return sum(list( map(_all2list, xl) ), [])
-
-
-
-def _mat2vec(m):
-        return vector(m.base_ring(), m.list())
+    return sum( map(_all2list, xl) , [])
 
-def _vec2mat(v):
-        return matrix(v.base_ring(), sqrt(v.degree()), v.list())
 
 def gram_schmidt(v, inner_product=None):
     """