Changeset 7846:46286c2f04b2

Timestamp:

12/20/07 02:43:22 (5 years ago)

Author:

Robert Bradshaw <robertwb@…>

Branch:

default

Message:

Start for symbolic matrices.

Files:

• sage/matrix/matrix_generic_dense.pyx (modified) (2 diffs)
• sage/matrix/matrix_space.py (modified) (2 diffs)
• sage/matrix/matrix_symbolic_dense.pxd (added)
• sage/matrix/matrix_symbolic_dense.pyx (added)
• setup.py (modified) (2 diffs)

sage/matrix/matrix_generic_dense.pyx

@@ -82 +82 @@
         else: 
         
-            self._entries = [None]*(self._nrows*self._ncols)
             zero = parent.base_ring()(0)
-            for i from 0 <= i < self._nrows * self._ncols:
-                self._entries[i] = zero
+            self._entries = [zero]*(self._nrows*self._ncols)
                 
             if x != zero:
@@ -94 +92 @@
 
     cdef set_unsafe(self, Py_ssize_t i, Py_ssize_t j, value):
-        # TODO: make faster with Python/C API        
-        self._entries[i*self._ncols + j] = value
+        Py_DECREF(<object>PyList_GET_ITEM(self._entries, i*self._ncols + j))
+        Py_INCREF(value)
+        PyList_SET_ITEM(self._entries, i*self._ncols + j, value)
 
     cdef get_unsafe(self, Py_ssize_t i, Py_ssize_t j):
-        # TODO: make faster with Python/C API
-        return self._entries[i*self._ncols + j]
+        return <object>PyList_GET_ITEM(self._entries, i*self._ncols + j)
 
     def _pickle(self):

sage/matrix/matrix_space.py

@@ -720 +720 @@
             sage: MS2._get_matrix_class()
             <type 'sage.matrix.matrix_integer_sparse.Matrix_integer_sparse'>
+            sage: type(matrix(SR, 2, 2, 0))
+            <type 'sage.matrix.matrix_symbolic_dense.Matrix_symbolic_dense'>
         """
         R = self.base_ring()
@@ -741 +743 @@
             #elif isinstance(R, sage.rings.padics.padic_ring_capped_relative.pAdicRingCappedRelative):
             #    return padics.matrix_padic_capped_relative_dense
-            # the default            
-            return matrix_generic_dense.Matrix_generic_dense
+            # the default      
+            else:
+                from sage.calculus.calculus import SR   # causes circular imports
+                if R == SR:
+                    import matrix_symbolic_dense
+                    return matrix_symbolic_dense.Matrix_symbolic_dense
+                return matrix_generic_dense.Matrix_generic_dense
         
         else:            

setup.py

@@ -373 +373 @@
                                      include_dirs=[SAGE_ROOT +'/local/include/singular'])
 
+matrix_symbolic_dense = Extension('sage.matrix.matrix_symbolic_dense',
+                                   ['sage/matrix/matrix_symbolic_dense.pyx'])
+
 #matrix_padic_capped_relative_dense = Extension('sage.matrix.padics.matrix_padic_capped_relative_dense',
 #                                               ['sage/matrix/padics/matrix_padic_capped_relative_dense.pyx'])
@@ -527 +530 @@
      matrix_mod2_dense,
      matrix_mpolynomial_dense, \
+     matrix_symbolic_dense, \
 
      cremona_mat, \