r18344 - in /branches/frame_order_testing: ./ extern/scientific_python/Geometry/ -- February 01, 2013 - 12:37

Author: bugman
Date: Fri Feb  1 12:37:48 2013
New Revision: 18344

URL: http://svn.gna.org/viewcvs/relax?rev=18344&view=rev
Log:
Merged revisions 18343 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18343 | bugman | 2013-02-01 12:37:16 +0100 (Fri, 01 Feb 2013) | 7 lines
  
  Fix for bug #20469 (https://gna.org/bugs/?20469).
  
  This is the Failure in reading X-ray PDB files using the ScientificPython 
parser.  The
  ScientificPython Geometry.Transformation module is now distributed with 
relax.  Some linear algebra
  imports in the Geometry.TensorModule in newly used code paths have been 
fixed as well.
........

Added:
    
branches/frame_order_testing/extern/scientific_python/Geometry/Transformation.py
      - copied unchanged from r18343, 
trunk/extern/scientific_python/Geometry/Transformation.py
Modified:
    branches/frame_order_testing/   (props changed)
    
branches/frame_order_testing/extern/scientific_python/Geometry/TensorModule.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Feb  1 12:37:48 2013
@@ -1,1 +1,1 @@
-/trunk:1-18341
+/trunk:1-18343

Modified: 
branches/frame_order_testing/extern/scientific_python/Geometry/TensorModule.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/extern/scientific_python/Geometry/TensorModule.py?rev=18344&r1=18343&r2=18344&view=diff
==============================================================================
--- 
branches/frame_order_testing/extern/scientific_python/Geometry/TensorModule.py
 (original)
+++ 
branches/frame_order_testing/extern/scientific_python/Geometry/TensorModule.py
 Fri Feb  1 12:37:48 2013
@@ -191,7 +191,7 @@
         @raises ValueError: if rank !=2 
         """
         if self.rank == 2:
-            from extern.scientific_python.LA import eigenvalues
+            from numpy.oldnumeric.linear_algebra import eigenvalues
             return eigenvalues(self.array)
         else:
             raise ValueError('Undefined operation')
@@ -204,7 +204,7 @@
         @raises ValueError: if rank !=2 
         """
         if self.rank == 2:
-            from extern.scientific_python.LA import eigenvectors
+            from numpy.oldnumeric.linear_algebra import eigenvectors
             ev, vectors = eigenvectors(self.array)
             return ev, Tensor(vectors)
         else:
@@ -217,7 +217,7 @@
         @raises ValueError: if rank !=2 
         """
         if self.rank == 2:
-            from extern.scientific_python.LA import inverse
+            from numpy.oldnumeric.linear_algebra import inverse
             return Tensor(inverse(self.array))
         else:
             raise ValueError('Undefined operation')