[Scipy-svn] r3795 - in branches/testing_cleanup: . scipy/sandbox/multigrid scipy/sandbox/timeseries scipy/sparse

[scipy-svn at scipy.org]

Author: matthew.brett at gmail.com
Date: 2008-01-07 18:11:08 -0600 (Mon, 07 Jan 2008)
New Revision: 3795

Modified:
   branches/testing_cleanup/
   branches/testing_cleanup/scipy/sandbox/multigrid/simple_test.py
   branches/testing_cleanup/scipy/sandbox/timeseries/trecords.py
   branches/testing_cleanup/scipy/sparse/compressed.py
Log:
Merged revisions 3787,3792-3793 via svnmerge from 
http://svn.scipy.org/svn/scipy/trunk

........
  r3787 | wnbell | 2008-01-06 17:42:20 -0800 (Sun, 06 Jan 2008) | 2 lines
  
  fixed typo
........
  r3792 | dhuard | 2008-01-07 11:33:00 -0800 (Mon, 07 Jan 2008) | 1 line
  
  Fixed an error in docstring of fromtextfile (datescol instead of dates_column).
........
  r3793 | wnbell | 2008-01-07 13:41:21 -0800 (Mon, 07 Jan 2008) | 2 lines
  
  modified multigrid test
........



Property changes on: branches/testing_cleanup
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/scipy.scons:1-3533 /trunk:1-3662,3667-3672,3674-3675,3684,3723-3735,3738,3744,3749,3754-3755,3759,3761,3764,3769,3774,3778-3785
   + /branches/scipy.scons:1-3533 /trunk:1-3662,3667-3672,3674-3675,3684,3723-3735,3738,3744,3749,3754-3755,3759,3761,3764,3769,3774,3778-3794

Modified: branches/testing_cleanup/scipy/sandbox/multigrid/simple_test.py
===================================================================
--- branches/testing_cleanup/scipy/sandbox/multigrid/simple_test.py	2008-01-08 00:00:03 UTC (rev 3794)
+++ branches/testing_cleanup/scipy/sandbox/multigrid/simple_test.py	2008-01-08 00:11:08 UTC (rev 3795)
@@ -1,8 +1,17 @@
-from multilevel import *
 from scipy import *
+from scipy.sandbox.multigrid.sa import *
+from scipy.sandbox.multigrid import *
+from scipy.sandbox.multigrid.utils import *
+from time import clock
 
-A = poisson_problem2D(200)
-rs_solver = ruge_stuben_solver(A)
+A = poisson_problem2D(500)
+
+start = clock()
+sa = smoothed_aggregation_solver(A)
+print "constructed solver in %s seconds" % (clock() - start)
+
 b = rand(A.shape[0])
-x,residuals = rs_solver.solve(b,return_residuals=True)
+start = clock()
+x,residuals = sa.solve(b,return_residuals=True)
+print "solved in %s seconds" % (clock() - start)
 print 'residuals',residuals

Modified: branches/testing_cleanup/scipy/sandbox/timeseries/trecords.py
===================================================================
--- branches/testing_cleanup/scipy/sandbox/timeseries/trecords.py	2008-01-08 00:00:03 UTC (rev 3794)
+++ branches/testing_cleanup/scipy/sandbox/timeseries/trecords.py	2008-01-08 00:11:08 UTC (rev 3795)
@@ -28,13 +28,15 @@
 
 import scipy.sandbox.maskedarray as MA
 #MaskedArray = MA.MaskedArray
-from scipy.sandbox.maskedarray.core import MaskedArray, MAError, default_fill_value, \
-    masked_print_option, masked, nomask, getmask, getmaskarray, make_mask,\
-    make_mask_none, mask_or, masked_array, filled
+from scipy.sandbox.maskedarray.core import MaskedArray, MAError, \
+     default_fill_value, masked_print_option, masked, nomask, \
+     getmask, getmaskarray, make_mask,\
+     make_mask_none, mask_or, masked_array, filled
 
 import scipy.sandbox.maskedarray.mrecords as MR
-from scipy.sandbox.maskedarray.mrecords import _checknames, _guessvartypes, openfile,\
-    MaskedRecords, fromrecords as mrecfromrecords
+from scipy.sandbox.maskedarray.mrecords import _checknames, \
+     _guessvartypes, openfile, MaskedRecords, \
+     fromrecords as mrecfromrecords
 
 from tseries import TimeSeries, time_series, _getdatalength
 from dates import Date, DateArray, date_array
@@ -425,7 +427,7 @@
       Alphanumeric character used to mark the start of a comment.
     - `missingchar` : String *['']*
       String indicating missing data, and used to create the masks.
-    - `datescol` : Integer *[None]*
+    - `dates_column` : Integer *[None]*
       Position of the columns storing dates. If None, a position will be
       estimated from the variable names.
     - `varnames` : Sequence *[None]*

Modified: branches/testing_cleanup/scipy/sparse/compressed.py
===================================================================
--- branches/testing_cleanup/scipy/sparse/compressed.py	2008-01-08 00:00:03 UTC (rev 3794)
+++ branches/testing_cleanup/scipy/sparse/compressed.py	2008-01-08 00:11:08 UTC (rev 3795)
@@ -588,7 +588,7 @@
         """
 
         #first check to see if result was cached
-        if not hasattr(self,'_has_sorted_indices'):
+        if not hasattr(self,'__has_sorted_indices'):
             fn = sparsetools.csr_has_sorted_indices
             self.__has_sorted_indices = \
                     fn( len(self.indptr) - 1, self.indptr, self.indices)