X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=mjo%2Foctonions.py;h=04aa318a3d8bed7158da61c26b0bb8b25f7cab0b;hb=76f32f73af9ac9f9e7258900c14c5eb318426712;hp=c2b829f98b9b49dbe078172a3669f0cb8b6406e4;hpb=b552c6f2ff883240e01ad2444c5051fc8716e72c;p=sage.d.git

diff --git a/mjo/octonions.py b/mjo/octonions.py
index c2b829f..04aa318 100644
--- a/mjo/octonions.py
+++ b/mjo/octonions.py
@@ -376,7 +376,7 @@ class OctonionMatrix(IndexedFreeModuleElement):
             [[e0 + 2*e3, 0, 0], [0, 0, 0], [0, 0, 0]]
 
         """
-        zero = self.parent().octonions().zero()
+        zero = self.parent().entry_algebra().zero()
         l = [[zero for j in range(self.ncols())] for i in range(self.nrows())]
         for (k,v) in self.monomial_coefficients().items():
             (i,j,e) = k
@@ -464,7 +464,7 @@ class OctonionMatrix(IndexedFreeModuleElement):
             3*e0
 
         """
-        zero = self.parent().octonions().zero()
+        zero = self.parent().entry_algebra().zero()
         return sum( (self[i,i] for i in range(self.nrows())), zero )
 
     def matrix_space(self):
@@ -514,27 +514,27 @@ class OctonionMatrixAlgebra(CombinatorialFreeModule):
     """
     Element = OctonionMatrix
 
-    def __init__(self, n, field=AA, prefix="E", **kwargs):
+    def __init__(self, n, scalars=AA, prefix="E", **kwargs):
         # Not associative, not commutative
-        category = MagmaticAlgebras(field).FiniteDimensional()
+        category = MagmaticAlgebras(scalars).FiniteDimensional()
         category = category.WithBasis().Unital()
 
         self._nrows = n
 
-        # Since the scalar field is real but the entries are octonion,
+        # Since the scalar ring is real but the entries are not,
         # sticking a "1" in each position doesn't give us a basis for
-        # the space. We actually need to stick each of e0, e1, ..., e7
-        # (a basis for the Octonions themselves) into each position.
+        # the space. We actually need to stick each of e0, e1, ...  (a
+        # basis for the entry algebra itself) into each position.
         from sage.sets.finite_enumerated_set import FiniteEnumeratedSet
         from sage.categories.sets_cat import cartesian_product
 
         I = FiniteEnumeratedSet(range(n))
         J = FiniteEnumeratedSet(range(n))
-        self._octonions = Octonions(field=field)
-        entry_basis = self._octonions.gens()
+        self._entry_algebra = Octonions(field=scalars)
+        entry_basis = self._entry_algebra.gens()
 
         basis_indices = cartesian_product([I,J,entry_basis])
-        super().__init__(field,
+        super().__init__(scalars,
                          basis_indices,
                          category=category,
                          prefix=prefix,
@@ -545,11 +545,11 @@ class OctonionMatrixAlgebra(CombinatorialFreeModule):
                 " over the scalar ring %s" %
                 (self.nrows(), self.ncols(), self.base_ring()) )
 
-    def octonions(self):
+    def entry_algebra(self):
         r"""
-        Return the Octonion algebra that our elements' entries come from.
+        Return the algebra that our elements' entries come from.
         """
-        return self._octonions
+        return self._entry_algebra
 
     def nrows(self):
         return self._nrows
@@ -578,7 +578,7 @@ class OctonionMatrixAlgebra(CombinatorialFreeModule):
             True
 
         """
-        return sum( (self.monomial((i,i,self._octonions.one()))
+        return sum( (self.monomial((i,i,self.entry_algebra().one()))
                      for i in range(self.nrows()) ),
                     self.zero() )
 
@@ -618,7 +618,7 @@ class OctonionMatrixAlgebra(CombinatorialFreeModule):
             # given octonion algebra to ours. Otherwise we can fail
             # to convert an element of (for example) Octonions(QQ)
             # to Octonions(AA).
-            return self.octonions().from_vector(e_ij.to_vector())
+            return self.entry_algebra().from_vector(e_ij.to_vector())
 
         return sum( (self.monomial( (i,j, convert(entries[i][j])) )
                      for i in range(nrows)