[Scipy-svn] r4921 - in trunk/scipy: fftpack interpolate sparse sparse/tests special

scipy-svn@scip... scipy-svn@scip...
Sun Nov 2 17:55:57 CST 2008


Author: jarrod.millman
Date: 2008-11-02 17:55:52 -0600 (Sun, 02 Nov 2008)
New Revision: 4921

Modified:
   trunk/scipy/fftpack/basic.py
   trunk/scipy/interpolate/rbf.py
   trunk/scipy/sparse/bsr.py
   trunk/scipy/sparse/compressed.py
   trunk/scipy/sparse/dok.py
   trunk/scipy/sparse/extract.py
   trunk/scipy/sparse/tests/test_base.py
   trunk/scipy/special/info.py
Log:
ran reindent


Modified: trunk/scipy/fftpack/basic.py
===================================================================
--- trunk/scipy/fftpack/basic.py	2008-11-02 23:45:17 UTC (rev 4920)
+++ trunk/scipy/fftpack/basic.py	2008-11-02 23:55:52 UTC (rev 4921)
@@ -241,7 +241,7 @@
         raise ValueError("when given, axes and shape arguments "\
                          "have to be of the same length")
 
-    # No need to swap axes, array is in C order 
+    # No need to swap axes, array is in C order
     if noaxes:
         for i in axes:
             x = _fix_shape(x, s[i], i)

Modified: trunk/scipy/interpolate/rbf.py
===================================================================
--- trunk/scipy/interpolate/rbf.py	2008-11-02 23:45:17 UTC (rev 4920)
+++ trunk/scipy/interpolate/rbf.py	2008-11-02 23:55:52 UTC (rev 4921)
@@ -49,7 +49,7 @@
 class Rbf(object):
     """
     Rbf(*args)
-    
+
     A class for radial basis function approximation/interpolation of
     n-dimensional scattered data.
 

Modified: trunk/scipy/sparse/bsr.py
===================================================================
--- trunk/scipy/sparse/bsr.py	2008-11-02 23:45:17 UTC (rev 4920)
+++ trunk/scipy/sparse/bsr.py	2008-11-02 23:55:52 UTC (rev 4921)
@@ -167,7 +167,7 @@
                 raise ValueError('need to infer shape')
             else:
                 self.shape = shape
-        
+
         if dtype is not None:
             self.data = self.data.astype(dtype)
 

Modified: trunk/scipy/sparse/compressed.py
===================================================================
--- trunk/scipy/sparse/compressed.py	2008-11-02 23:45:17 UTC (rev 4920)
+++ trunk/scipy/sparse/compressed.py	2008-11-02 23:55:52 UTC (rev 4921)
@@ -83,7 +83,7 @@
                     raise ValueError,'unable to infer matrix dimensions'
                 else:
                     self.shape = self._swap((major_dim,minor_dim))
-        
+
         if dtype is not None:
             self.data = self.data.astype(dtype)
 

Modified: trunk/scipy/sparse/dok.py
===================================================================
--- trunk/scipy/sparse/dok.py	2008-11-02 23:45:17 UTC (rev 4920)
+++ trunk/scipy/sparse/dok.py	2008-11-02 23:55:52 UTC (rev 4921)
@@ -59,7 +59,7 @@
                 arg1 = arg1.copy()
             else:
                 arg1 = arg1.todok()
-            
+
             if dtype is not None:
                 arg1 = arg1.astype(dtype)
 
@@ -379,7 +379,7 @@
         for (i,j),v in self.iteritems():
             result[i] += v * other[j]
         return result
-    
+
     def _mul_multivector(self, other):
         #matrix * multivector
         M,N = self.shape
@@ -493,7 +493,7 @@
                     newkey = (key[0]-num, key[1])
                     base[newkey] = self[key]
         return base, ext
-    
+
     def tocoo(self):
         """ Return a copy of this matrix in COOrdinate format"""
         from coo import coo_matrix

Modified: trunk/scipy/sparse/extract.py
===================================================================
--- trunk/scipy/sparse/extract.py	2008-11-02 23:45:17 UTC (rev 4920)
+++ trunk/scipy/sparse/extract.py	2008-11-02 23:55:52 UTC (rev 4921)
@@ -29,7 +29,7 @@
     >>> A = csr_matrix([[7.0, 8.0, 0],[0, 0, 9.0]])
     >>> find(A)
     (array([0, 0, 1], dtype=int32), array([0, 1, 2], dtype=int32), array([ 7.,  8.,  9.]))
-    
+
     """
 
     A = coo_matrix(A).tocsr()  #sums duplicates

Modified: trunk/scipy/sparse/tests/test_base.py
===================================================================
--- trunk/scipy/sparse/tests/test_base.py	2008-11-02 23:45:17 UTC (rev 4920)
+++ trunk/scipy/sparse/tests/test_base.py	2008-11-02 23:55:52 UTC (rev 4921)
@@ -151,7 +151,7 @@
     def test_from_array(self):
         A = array([[1,0,0],[2,3,4],[0,5,0],[0,0,0]])
         assert_array_equal(self.spmatrix(A).toarray(), A)
-        
+
         A = array([[1.0 + 3j,       0,      0],
                    [       0, 2.0 + 5,      0],
                    [       0,       0,      0]])
@@ -161,7 +161,7 @@
     def test_from_matrix(self):
         A = matrix([[1,0,0],[2,3,4],[0,5,0],[0,0,0]])
         assert_array_equal(self.spmatrix(A).todense(), A)
-        
+
         A = matrix([[1.0 + 3j,       0,      0],
                     [       0, 2.0 + 5,      0],
                     [       0,       0,      0]])
@@ -171,7 +171,7 @@
     def test_from_list(self):
         A = [[1,0,0],[2,3,4],[0,5,0],[0,0,0]]
         assert_array_equal(self.spmatrix(A).todense(), A)
-        
+
         A = [[1.0 + 3j,       0,      0],
              [       0, 2.0 + 5,      0],
              [       0,       0,      0]]
@@ -224,7 +224,7 @@
         dense_dot_dense = dot(dat, b)
         check2 = dot(self.datsp.toarray(), b)
         assert_array_equal(dense_dot_dense, check2)
-    
+
     def test_astype(self):
         D = array([[1.0 + 3j,       0,      0],
                    [       0, 2.0 + 5,      0],

Modified: trunk/scipy/special/info.py
===================================================================
--- trunk/scipy/special/info.py	2008-11-02 23:45:17 UTC (rev 4920)
+++ trunk/scipy/special/info.py	2008-11-02 23:55:52 UTC (rev 4921)
@@ -123,9 +123,9 @@
 *  fdtri      -- Inverse of fdtrc
 *  gdtr       -- Integral from 0 to x of gamma pdf.
 *  gdtrc      -- Integral from x to infinity under gamma pdf.
-*  gdtria     -- 
-*  gdtrib     -- 
-*  gdtrix     -- 
+*  gdtria     --
+*  gdtrib     --
+*  gdtrix     --
 *  nbdtr      -- Sum of terms 0 through k of the negative binomial pdf.
 *  nbdtrc     -- Sum of terms k+1 to infinity under negative binomial pdf.
 *  nbdtri     -- Inverse of nbdtr



More information about the Scipy-svn mailing list