[Scipy-svn] r4975 - trunk/scipy/sparse

[scipy-svn at scipy.org]

Author: wnbell
Date: 2008-11-03 19:14:35 -0600 (Mon, 03 Nov 2008)
New Revision: 4975

Modified:
   trunk/scipy/sparse/base.py
   trunk/scipy/sparse/data.py
Log:
make sparse.conjugate() always copy index arrays


Modified: trunk/scipy/sparse/base.py
===================================================================
--- trunk/scipy/sparse/base.py	2008-11-04 00:19:36 UTC (rev 4974)
+++ trunk/scipy/sparse/base.py	2008-11-04 01:14:35 UTC (rev 4975)
@@ -432,7 +432,7 @@
         return self.tocsr().conj()
 
     def conjugate(self):
-        return self.tocsr().conj()
+        return self.conj()
 
     # Renamed conjtranspose() -> getH() for compatibility with dense matrices
     def getH(self):

Modified: trunk/scipy/sparse/data.py
===================================================================
--- trunk/scipy/sparse/data.py	2008-11-04 00:19:36 UTC (rev 4974)
+++ trunk/scipy/sparse/data.py	2008-11-04 01:14:35 UTC (rev 4975)
@@ -53,11 +53,11 @@
     def astype(self, t):
         return self._with_data(self.data.astype(t))
 
-    def conj(self, copy=False):
-        return self._with_data(self.data.conj(),copy=copy)
+    def conj(self):
+        return self._with_data(self.data.conj())
 
     def copy(self):
-        return self._with_data(self.data.copy(),copy=True)
+        return self._with_data(self.data.copy(), copy=True)
 
 
     ###########################
@@ -66,3 +66,5 @@
 
     def _mul_scalar(self, other):
         return self._with_data(self.data * other)
+
+