r23605 - /trunk/lib/frame_order/matrix_ops.py -- May 29, 2014 - 19:47

Author: bugman
Date: Thu May 29 19:47:23 2014
New Revision: 23605

URL: http://svn.gna.org/viewcvs/relax?rev=23605&view=rev
Log:
The frame order analysis now uses the lib.compat.norm() replacement for 
numpy.linalg.norm().

This is to allow for the axis argument on numpy versions before version 1.8, 
though these older
versions will result in slower optimisation of the frame order models.


Modified:
    trunk/lib/frame_order/matrix_ops.py

Modified: trunk/lib/frame_order/matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/frame_order/matrix_ops.py?rev=23605&r1=23604&r2=23605&view=diff
==============================================================================
--- trunk/lib/frame_order/matrix_ops.py (original)
+++ trunk/lib/frame_order/matrix_ops.py Thu May 29 19:47:23 2014
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2009-2013 Edward d'Auvergne                                  
 #
+# Copyright (C) 2009-2014 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax (http://www.nmr-relax.com).         
 #
 #                                                                            
 #
@@ -25,9 +25,9 @@
 # Python module imports.
 from math import cos, sin
 from numpy import dot, inner, sqrt, transpose
-from numpy.linalg import norm
 
 # relax module imports.
+from lib.compat import norm
 from lib.linear_algebra.kronecker_product import transpose_23
 from lib.geometry.rotations import tilt_torsion_to_R