[Scipy-svn] r3030 - trunk/Lib/sandbox/lobpcg

[scipy-svn at scipy.org]

Author: rc
Date: 2007-05-22 09:40:52 -0500 (Tue, 22 May 2007)
New Revision: 3030

Modified:
   trunk/Lib/sandbox/lobpcg/lobpcg.py
Log:
small fixes

Modified: trunk/Lib/sandbox/lobpcg/lobpcg.py
===================================================================
--- trunk/Lib/sandbox/lobpcg/lobpcg.py	2007-05-22 09:56:10 UTC (rev 3029)
+++ trunk/Lib/sandbox/lobpcg/lobpcg.py	2007-05-22 14:40:52 UTC (rev 3030)
@@ -145,7 +145,7 @@
 ##               operatorA.shape
 
     if residualTolerance is None:
-        residualTolerance = sqrt( 1e-15 ) * n
+        residualTolerance = nm.sqrt( 1e-15 ) * n
 
     maxIterations = min( n, maxIterations )
 
@@ -283,8 +283,9 @@
 
         ##
         # Apply constraints to the preconditioned residuals.
-        applyConstraints( activeBlockVectorR,
-                          gramYBY, blockVectorBY, blockVectorY )
+        if blockVectorY is not None:
+            applyConstraints( activeBlockVectorR,
+                              gramYBY, blockVectorBY, blockVectorY )
 
 #        assert nm.all( blockVectorR == activeBlockVectorR )