X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=mjo%2Feja%2Feja_algebra.py;h=d4ee9b022d8524752d3e15edf37284c2381ce509;hb=ec7dbfb6ce0054f55280412e43870b4019abc40c;hp=76a8ce624d526b8c3bd67de6d3b169b4b866d73b;hpb=e20375c18a22ff8dd3ed114c57d63ef8eca3a209;p=sage.d.git

diff --git a/mjo/eja/eja_algebra.py b/mjo/eja/eja_algebra.py
index 76a8ce6..d4ee9b0 100644
--- a/mjo/eja/eja_algebra.py
+++ b/mjo/eja/eja_algebra.py
@@ -64,8 +64,10 @@ class FiniteDimensionalEuclideanJordanAlgebra(CombinatorialFreeModule):
         # long run to have the multiplication table be in terms of
         # algebra elements. We do this after calling the superclass
         # constructor so that from_vector() knows what to do.
-        self._multiplication_table = [ map(lambda x: self.from_vector(x), ls)
-                                       for ls in mult_table ]
+        self._multiplication_table = matrix(
+            [ map(lambda x: self.from_vector(x), ls)
+              for ls in mult_table ] )
+        self._multiplication_table.set_immutable()
 
 
     def _element_constructor_(self, elt):
@@ -153,7 +155,7 @@ class FiniteDimensionalEuclideanJordanAlgebra(CombinatorialFreeModule):
         return fmt.format(self.dimension(), self.base_ring())
 
     def product_on_basis(self, i, j):
-        return self._multiplication_table[i][j]
+        return self._multiplication_table[i,j]
 
     def _a_regular_element(self):
         """
@@ -249,8 +251,9 @@ class FiniteDimensionalEuclideanJordanAlgebra(CombinatorialFreeModule):
         R = PolynomialRing(self.base_ring(), names)
         # Hack around the fact that our multiplication table is in terms of
         # algebra elements but the constructor wants it in terms of vectors.
-        vmt = [ tuple(map(lambda x: x.to_vector(), ls))
-                for ls in self._multiplication_table ]
+        vmt = [ tuple([ self._multiplication_table[i,j].to_vector()
+                        for j in range(self._multiplication_table.nrows()) ])
+                for i in range(self._multiplication_table.ncols()) ]
         J = FiniteDimensionalEuclideanJordanAlgebra(R, tuple(vmt), r)
 
         idmat = matrix.identity(J.base_ring(), n)
@@ -389,6 +392,11 @@ class FiniteDimensionalEuclideanJordanAlgebra(CombinatorialFreeModule):
         method that would otherwise just crash and complain about the
         algebra being infinite.
 
+        SETUP::
+
+            sage: from mjo.eja.eja_algebra import (JordanSpinEJA,
+            ....:                                  RealCartesianProductEJA)
+
         EXAMPLES::
 
             sage: J = RealCartesianProductEJA(3)
@@ -406,7 +414,7 @@ class FiniteDimensionalEuclideanJordanAlgebra(CombinatorialFreeModule):
             [e2  0 e0]
 
         """
-        return matrix(self._multiplication_table)
+        return self._multiplication_table
 
 
     def natural_basis(self):
@@ -472,7 +480,7 @@ class FiniteDimensionalEuclideanJordanAlgebra(CombinatorialFreeModule):
             sage: J.one()
             e0 + e1 + e2 + e3 + e4
 
-        TESTS::
+        TESTS:
 
         The identity element acts like the identity::
 
@@ -633,8 +641,8 @@ class RealCartesianProductEJA(FiniteDimensionalEuclideanJordanAlgebra):
     """
     def __init__(self, n, field=QQ):
         V = VectorSpace(field, n)
-        mult_table = [ [ V.basis()[i]*(i == j) for i in range(n) ]
-                       for j in range(n) ]
+        mult_table = [ [ V.gen(i)*(i == j) for j in range(n) ]
+                       for i in range(n) ]
 
         fdeja = super(RealCartesianProductEJA, self)
         return fdeja.__init__(field, mult_table, rank=n)
@@ -821,7 +829,7 @@ def _multiplication_table_from_matrix_basis(basis):
     V = VectorSpace(field, dimension**2)
     W = V.span_of_basis( _mat2vec(s) for s in basis )
     n = len(basis)
-    mult_table = [[W.zero() for i in range(n)] for j in range(n)]
+    mult_table = [[W.zero() for j in range(n)] for i in range(n)]
     for i in range(n):
         for j in range(n):
             mat_entry = (basis[i]*basis[j] + basis[j]*basis[i])/2
@@ -1287,11 +1295,11 @@ class JordanSpinEJA(FiniteDimensionalEuclideanJordanAlgebra):
     """
     def __init__(self, n, field=QQ):
         V = VectorSpace(field, n)
-        mult_table = [[V.zero() for i in range(n)] for j in range(n)]
+        mult_table = [[V.zero() for j in range(n)] for i in range(n)]
         for i in range(n):
             for j in range(n):
-                x = V.basis()[i]
-                y = V.basis()[j]
+                x = V.gen(i)
+                y = V.gen(j)
                 x0 = x[0]
                 xbar = x[1:]
                 y0 = y[0]