[Scipy-svn] r4635 - in trunk/scipy/stats/models: . tests

scipy-svn@scip... scipy-svn@scip...
Sun Aug 10 20:21:02 CDT 2008


Author: jarrod.millman
Date: 2008-08-10 20:20:59 -0500 (Sun, 10 Aug 2008)
New Revision: 4635

Modified:
   trunk/scipy/stats/models/bspline.py
   trunk/scipy/stats/models/setup.py
   trunk/scipy/stats/models/setupscons.py
   trunk/scipy/stats/models/tests/test_bspline.py
Log:
ran reindent


Modified: trunk/scipy/stats/models/bspline.py
===================================================================
--- trunk/scipy/stats/models/bspline.py	2008-08-09 19:29:36 UTC (rev 4634)
+++ trunk/scipy/stats/models/bspline.py	2008-08-11 01:20:59 UTC (rev 4635)
@@ -198,9 +198,9 @@
                  Bspline to avoid extra evaluation in the __call__ method
 
     '''
-    # FIXME: update parameter names, replace single character names 
+    # FIXME: update parameter names, replace single character names
     # FIXME: `order` should be actual spline order (implemented as order+1)
-    ## FIXME: update the use of spline order in extension code (evaluate is recursively called) 
+    ## FIXME: update the use of spline order in extension code (evaluate is recursively called)
     # FIXME: eliminate duplicate M and m attributes (m is order, M is related to tau size)
 
     def __init__(self, knots, order=4, M=None, coef=None, x=None):
@@ -437,7 +437,7 @@
 
            fhat = ARGMIN_f SUM_i=1^n (y_i-f(x_i))^2 + pen * int f^(2)^2
 
-	   int is integral. pen is lambda (from Hastie)
+           int is integral. pen is lambda (from Hastie)
 
            See Chapter 5 of
 

Modified: trunk/scipy/stats/models/setup.py
===================================================================
--- trunk/scipy/stats/models/setup.py	2008-08-09 19:29:36 UTC (rev 4634)
+++ trunk/scipy/stats/models/setup.py	2008-08-11 01:20:59 UTC (rev 4635)
@@ -18,4 +18,3 @@
 
     from numpy.distutils.core import setup
     setup(**configuration(top_path='').todict())
-

Modified: trunk/scipy/stats/models/setupscons.py
===================================================================
--- trunk/scipy/stats/models/setupscons.py	2008-08-09 19:29:36 UTC (rev 4634)
+++ trunk/scipy/stats/models/setupscons.py	2008-08-11 01:20:59 UTC (rev 4635)
@@ -18,4 +18,3 @@
 
     from numpy.distutils.core import setup
     setup(**configuration(top_path='').todict())
-

Modified: trunk/scipy/stats/models/tests/test_bspline.py
===================================================================
--- trunk/scipy/stats/models/tests/test_bspline.py	2008-08-09 19:29:36 UTC (rev 4634)
+++ trunk/scipy/stats/models/tests/test_bspline.py	2008-08-11 01:20:59 UTC (rev 4635)
@@ -19,8 +19,8 @@
     # C extension is working (in a technical sense, not functional).
     def test_basis(self):
         b = bsp.BSpline(np.linspace(0,1,11))
-	x = np.array([0.4, 0.5])
-	v = b.basis(x, lower=0, upper=13)
+        x = np.array([0.4, 0.5])
+        v = b.basis(x, lower=0, upper=13)
         t = np.array([[ 0.        ,  0.        ],
                       [ 0.        ,  0.        ],
                       [ 0.        ,  0.        ],
@@ -34,7 +34,7 @@
                       [ 0.        ,  0.        ],
                       [ 0.        ,  0.        ],
                       [ 0.        ,  0.        ]])
-	assert_array_almost_equal(v, t, decimal=6)
+        assert_array_almost_equal(v, t, decimal=6)
 
     # FIXME: Have no idea what this test does.  It's here to simply verify the
     # C extension is working (in a technical sense, not functional).



More information about the Scipy-svn mailing list