X-Git-Url: http://gitweb.michael.orlitzky.com/?p=sage.d.git;a=blobdiff_plain;f=mjo%2Feja%2Feja_subalgebra.py;h=ca8efa1fd410b8f5f3f6d177b62779b1a24ccaf5;hp=1286a167f4c5ede4fa45252a545fd848f3014ab9;hb=HEAD;hpb=928b7d49fda98ff105c92293b5797bb7a2b9873a

diff --git a/mjo/eja/eja_subalgebra.py b/mjo/eja/eja_subalgebra.py
index 1286a16..97a7978 100644
--- a/mjo/eja/eja_subalgebra.py
+++ b/mjo/eja/eja_subalgebra.py
@@ -1,10 +1,11 @@
 from sage.matrix.constructor import matrix
 from sage.misc.cachefunc import cached_method
 
-from mjo.eja.eja_algebra import FiniteDimensionalEJA
-from mjo.eja.eja_element import FiniteDimensionalEJAElement
+from mjo.eja.eja_algebra import EJA
+from mjo.eja.eja_element import (EJAElement,
+                                 CartesianProductParentEJAElement)
 
-class FiniteDimensionalEJASubalgebraElement(FiniteDimensionalEJAElement):
+class EJASubalgebraElement(EJAElement):
     """
     SETUP::
 
@@ -27,10 +28,10 @@ class FiniteDimensionalEJASubalgebraElement(FiniteDimensionalEJAElement):
     works like it does in the superalgebra, even if we orthonormalize
     our basis::
 
-        sage: x = random_eja(field=AA).random_element()
-        sage: A = x.subalgebra_generated_by(orthonormalize=True)
-        sage: y = A.random_element()
-        sage: y.operator()(A.one()) == y
+        sage: x = random_eja(field=AA).random_element()           # long time
+        sage: A = x.subalgebra_generated_by(orthonormalize=True)  # long time
+        sage: y = A.random_element()                              # long time
+        sage: y.operator()(A.one()) == y                          # long time
         True
 
     """
@@ -87,7 +88,7 @@ class FiniteDimensionalEJASubalgebraElement(FiniteDimensionalEJAElement):
 
 
 
-class FiniteDimensionalEJASubalgebra(FiniteDimensionalEJA):
+class EJASubalgebra(EJA):
     """
     A subalgebra of an EJA with a given basis.
 
@@ -96,7 +97,7 @@ class FiniteDimensionalEJASubalgebra(FiniteDimensionalEJA):
         sage: from mjo.eja.eja_algebra import (ComplexHermitianEJA,
         ....:                                  JordanSpinEJA,
         ....:                                  RealSymmetricEJA)
-        sage: from mjo.eja.eja_subalgebra import FiniteDimensionalEJASubalgebra
+        sage: from mjo.eja.eja_subalgebra import EJASubalgebra
 
     EXAMPLES:
 
@@ -108,11 +109,11 @@ class FiniteDimensionalEJASubalgebra(FiniteDimensionalEJA):
         ....:                    [0,0] ])
         sage: E22 = matrix(AA, [ [0,0],
         ....:                    [0,1] ])
-        sage: K1 = FiniteDimensionalEJASubalgebra(J, (J(E11),), associative=True)
+        sage: K1 = EJASubalgebra(J, (J(E11),), associative=True)
         sage: K1.one().to_matrix()
         [1 0]
         [0 0]
-        sage: K2 = FiniteDimensionalEJASubalgebra(J, (J(E22),), associative=True)
+        sage: K2 = EJASubalgebra(J, (J(E22),), associative=True)
         sage: K2.one().to_matrix()
         [0 0]
         [0 1]
@@ -184,7 +185,7 @@ class FiniteDimensionalEJASubalgebra(FiniteDimensionalEJA):
         SETUP::
 
             sage: from mjo.eja.eja_algebra import RealSymmetricEJA
-            sage: from mjo.eja.eja_subalgebra import FiniteDimensionalEJASubalgebra
+            sage: from mjo.eja.eja_subalgebra import EJASubalgebra
 
         EXAMPLES::
 
@@ -194,7 +195,7 @@ class FiniteDimensionalEJASubalgebra(FiniteDimensionalEJA):
             ....:                  [1,0,0] ])
             sage: x = J(X)
             sage: basis = ( x, x^2 ) # x^2 is the identity matrix
-            sage: K = FiniteDimensionalEJASubalgebra(J,
+            sage: K = EJASubalgebra(J,
             ....:                                    basis,
             ....:                                    associative=True,
             ....:                                    orthonormalize=False)
@@ -255,13 +256,52 @@ class FiniteDimensionalEJASubalgebra(FiniteDimensionalEJA):
             True
 
         """
-        from mjo.eja.eja_operator import FiniteDimensionalEJAOperator
+        from mjo.eja.eja_operator import EJAOperator
         mm = self._module_morphism(lambda j: self.superalgebra()(self.monomial(j).to_matrix()),
                                    codomain=self.superalgebra())
-        return FiniteDimensionalEJAOperator(self,
+        return EJAOperator(self,
                                             self.superalgebra(),
                                             mm.matrix())
 
 
 
-    Element = FiniteDimensionalEJASubalgebraElement
+    Element = EJASubalgebraElement
+
+
+
+class CartesianProductEJASubalgebraElement(EJASubalgebraElement,
+                                           CartesianProductParentEJAElement):
+    r"""
+    The class for elements that both belong to a subalgebra and
+    have a Cartesian product algebra as their parent. By inheriting
+    :class:`CartesianProductParentEJAElement` in addition to
+    :class:`EJASubalgebraElement`, we allow the
+    ``to_matrix()`` method to be overridden with the version that
+    works on Cartesian products.
+
+    SETUP::
+
+        sage: from mjo.eja.eja_algebra import (HadamardEJA,
+        ....:                                  RealSymmetricEJA)
+
+    TESTS:
+
+    This used to fail when ``subalgebra_idempotent()`` tried to
+    embed the subalgebra element back into the original EJA::
+
+        sage: J1 = HadamardEJA(0, field=QQ, orthonormalize=False)
+        sage: J2 = RealSymmetricEJA(2, field=QQ, orthonormalize=False)
+        sage: J = cartesian_product([J1,J2])
+        sage: J.one().subalgebra_idempotent() == J.one()
+        True
+
+    """
+    pass
+
+class CartesianProductEJASubalgebra(EJASubalgebra):
+    r"""
+    Subalgebras whose parents are Cartesian products. Exists only
+    to specify a special element class that will (in addition)
+    inherit from ``CartesianProductParentEJAElement``.
+    """
+    Element = CartesianProductEJASubalgebraElement