branch update

Author: Marie BONBOIRE

src/sage/matrix/matrix_modn_dense_template.pxi

@@ -539,33 +539,12 @@ cdef class Matrix_modn_dense_template(Matrix_dense):
                 if coerce:
                     v[se.j] = mpz_fdiv_ui((<Integer>x).value, p)
                 else:
-                    v[j] = <celement>x
                     v[se.j] = mpz_get_ui((<Integer>x).value)
             elif coerce:
                 v[se.j] = R(x)
             else:
                 v[se.j] = <celement>x
 
-	
-        #for i in range(ma.nrows):
-        #    v = self._matrix[i]
-        #    for j in range(ma.ncols):
-        #        x = next(it)
-        #        if type(x) is int:
-        #            tmp = (<long>x) % p
-        #            v[j] = tmp + (tmp<0)*p
-        #        elif type(x) is IntegerMod_int and (<IntegerMod_int>x)._parent is R:
-        #            v[j] = <celement>(<IntegerMod_int>x).ivalue
-        #        elif type(x) is Integer:
-        #            if coerce:
-        #                v[j] = mpz_fdiv_ui((<Integer>x).value, p)
-        #            else:
-        #                v[j] = mpz_get_ui((<Integer>x).value)
-        #        elif coerce:
-        #            v[j] = R(x)
-        #        else:
-        #            v[j] = <celement>x
-
     cdef long _hash_(self) except -1:
         """
         EXAMPLES::
@@ -870,7 +849,7 @@ cdef class Matrix_modn_dense_template(Matrix_dense):
             False
         """
         cdef Matrix_modn_dense_template A
-        A = self.__class__.__new__(self.__class__, self._parent, 0, 0, 0, zeroed_alloc=False)
+        A = self.__class__.__new__(self.__class__,self._parent,None,None,None,zeroed_alloc=False)
         memcpy(A._entries, self._entries, sizeof(celement)*self._nrows*self._ncols)
         if self._subdivisions is not None:
             A.subdivide(*self.subdivisions())

src/sage/matrix/matrix_space.py

@@ -1804,12 +1804,7 @@ def identity_matrix(self):
         """
         if self.__nrows != self.__ncols:
             raise TypeError("identity matrix must be square")
-        
-        if self._copy_zero:
-            A = self.zero_matrix().__copy__()
-        else:
-            A = self.matrix()
-
+        A = self.zero_matrix().__copy__()
         for i in range(self.__nrows):
             A[i, i] = 1
         A.set_immutable()
@@ -1868,12 +1863,7 @@ def diagonal_matrix(self, entries):
             raise TypeError("diagonal matrix must be square")
         if self.__nrows < len(entries):
             raise ValueError('number of diagonal matrix entries (%s) exceeds the matrix size (%s)' % (len(entries), self.__nrows))
-        
-        if self._copy_zero:
-            A = self.zero_matrix().__copy__()
-        else:
-            A = self.matrix()
-
+        A = self.zero_matrix().__copy__()
         for i in range(len(entries)):
             A[i, i] = entries[i]
         return A