X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=mjo%2Feja%2Feja_subalgebra.py;h=c43e53f2b030ed920e6cc22d10c3097c4b704cec;hb=c75f59725b9cfd923256d83dc3817a0f5f42d638;hp=7451e47bdbbbf2d58ce598aa3bb4e17ec42d5dae;hpb=ec7dbfb6ce0054f55280412e43870b4019abc40c;p=sage.d.git

diff --git a/mjo/eja/eja_subalgebra.py b/mjo/eja/eja_subalgebra.py
index 7451e47..c43e53f 100644
--- a/mjo/eja/eja_subalgebra.py
+++ b/mjo/eja/eja_subalgebra.py
@@ -71,6 +71,25 @@ class FiniteDimensionalEuclideanJordanElementSubalgebraElement(FiniteDimensional
 class FiniteDimensionalEuclideanJordanElementSubalgebra(FiniteDimensionalEuclideanJordanAlgebra):
     """
     The subalgebra of an EJA generated by a single element.
+
+    SETUP::
+
+        sage: from mjo.eja.eja_algebra import JordanSpinEJA
+
+    TESTS:
+
+    Ensure that our generator names don't conflict with the superalgebra::
+
+        sage: J = JordanSpinEJA(3)
+        sage: J.one().subalgebra_generated_by().gens()
+        (f0,)
+        sage: J = JordanSpinEJA(3, prefix='f')
+        sage: J.one().subalgebra_generated_by().gens()
+        (g0,)
+        sage: J = JordanSpinEJA(3, prefix='b')
+        sage: J.one().subalgebra_generated_by().gens()
+        (c0,)
+
     """
     def __init__(self, elt):
         superalgebra = elt.parent()
@@ -106,8 +125,17 @@ class FiniteDimensionalEuclideanJordanElementSubalgebra(FiniteDimensionalEuclide
                 product = superalgebra_basis[i]*superalgebra_basis[j]
                 mult_table[i][j] = W.coordinate_vector(product.to_vector())
 
-        # TODO: We'll have to redo this and make it unique again...
-        prefix = 'f'
+        # A half-assed attempt to ensure that we don't collide with
+        # the superalgebra's prefix (ignoring the fact that there
+        # could be super-superelgrbas in scope). If possible, we
+        # try to "increment" the parent algebra's prefix, although
+        # this idea goes out the window fast because some prefixen
+        # are off-limits.
+        prefixen = [ 'f', 'g', 'h', 'a', 'b', 'c', 'd' ]
+        try:
+            prefix = prefixen[prefixen.index(superalgebra.prefix()) + 1]
+        except ValueError:
+            prefix = prefixen[0]
 
         # The rank is the highest possible degree of a minimal
         # polynomial, and is bounded above by the dimension. We know
@@ -157,6 +185,12 @@ class FiniteDimensionalEuclideanJordanElementSubalgebra(FiniteDimensionalEuclide
         ::
 
         """
+        if elt == 0:
+            # Just as in the superalgebra class, we need to hack
+            # this special case to ensure that random_element() can
+            # coerce a ring zero into the algebra.
+            return self.zero()
+
         if elt in self.superalgebra():
             coords = self.vector_space().coordinate_vector(elt.to_vector())
             return self.from_vector(coords)