r19616 - in /branches/relax_disp: ./ devel_scripts/ lib/ test_suite/unit_tests/_lib/ -- May 02, 2013 - 12:41

Author: bugman
Date: Thu May  2 12:41:26 2013
New Revision: 19616

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

........
  r19612 | bugman | 2013-05-02 12:05:15 +0200 (Thu, 02 May 2013) | 3 lines
  
  Removed the numpy dependence from the manual C module compilation script.
........
  r19613 | bugman | 2013-05-02 12:15:04 +0200 (Thu, 02 May 2013) | 5 lines
  
  Created the lib.mathematics relax library module.
  
  This currently contains two functions, order_of_magnitude() and 
round_to_next_order().
........
  r19614 | bugman | 2013-05-02 12:40:14 +0200 (Thu, 02 May 2013) | 3 lines
  
  Added unit tests for the lib.mathematics module.
........
  r19615 | bugman | 2013-05-02 12:40:30 +0200 (Thu, 02 May 2013) | 3 lines
  
  Bug fixes for the lib.mathematics module as found by the unit tests.
........

Added:
    branches/relax_disp/lib/mathematics.py
      - copied unchanged from r19615, trunk/lib/mathematics.py
    branches/relax_disp/test_suite/unit_tests/_lib/test_mathematics.py
      - copied unchanged from r19615, 
trunk/test_suite/unit_tests/_lib/test_mathematics.py
Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/devel_scripts/manual_c_module.py
    branches/relax_disp/lib/__init__.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May  2 12:41:26 2013
@@ -1,1 +1,1 @@
-/trunk:1-19609
+/trunk:1-19615

Modified: branches/relax_disp/devel_scripts/manual_c_module.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/devel_scripts/manual_c_module.py?rev=19616&r1=19615&r2=19616&view=diff
==============================================================================
--- branches/relax_disp/devel_scripts/manual_c_module.py (original)
+++ branches/relax_disp/devel_scripts/manual_c_module.py Thu May  2 12:41:26 
2013
@@ -20,13 +20,10 @@
 elif target == '3.3':
     include = '%s/include/python3.3m/' % path
 
-# numpy includes.
-numpy_include = '%s/lib/python%s/site-packages/numpy/core/include/' % (path, 
target)
-
 # Python 3.2 installed in the home directory.
-cmd.append("gcc -o target_functions/c_chi2.os -c -I%s -I%s -fPIC 
target_functions/c_chi2.c" % (include, numpy_include))
-cmd.append("gcc -o target_functions/exponential.os -c -I%s -I%s -fPIC 
target_functions/exponential.c" % (include, numpy_include))
-cmd.append("gcc -o target_functions/relax_fit.os -c -I%s -I%s -fPIC 
target_functions/relax_fit.c" % (include, numpy_include))
+cmd.append("gcc -o target_functions/c_chi2.os -c -I%s -fPIC 
target_functions/c_chi2.c" % include)
+cmd.append("gcc -o target_functions/exponential.os -c -I%s -fPIC 
target_functions/exponential.c" % include)
+cmd.append("gcc -o target_functions/relax_fit.os -c -I%s -fPIC 
target_functions/relax_fit.c" % include)
 cmd.append("gcc -o target_functions/relax_fit.so -shared 
target_functions/c_chi2.os target_functions/exponential.os 
target_functions/relax_fit.os")
 
 

Modified: branches/relax_disp/lib/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/__init__.py?rev=19616&r1=19615&r2=19616&view=diff
==============================================================================
--- branches/relax_disp/lib/__init__.py (original)
+++ branches/relax_disp/lib/__init__.py Thu May  2 12:41:26 2013
@@ -39,6 +39,7 @@
     'io',
     'linear_algebra',
     'list',
+    'mathematics',
     'model_selection',
     'order',
     'physical_constants',