Author: bugman
Date: Tue Jun 10 17:04:40 2014
New Revision: 23790
URL: http://svn.gna.org/viewcvs/relax?rev=23790&view=rev
Log:
Merged revisions 23784-23785 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r23784 | tlinnet | 2014-06-10 11:49:00 +0200 (Tue, 10 Jun 2014) | 7 lines
Lowered chi2 value test in system test
Relax_disp.test_bug_22146_unpacking_r2a_r2b_cluster_NS_STAR.
This is due to the data produced on 32 bit machine, and tested on 64 bit
machines.
The error was:
AssertionError: 2.4659455670347743e-05 != 0.0 within 7 places
The reason for this is due to truncation artifacts.
........
r23785 | tlinnet | 2014-06-10 12:23:01 +0200 (Tue, 10 Jun 2014) | 5 lines
Fix for wrong path testing of Python.h.
Python.h would be in PYTHON_PREFIX/include/pythonX.Y/Python.h
and not in:
PYTHON_PREFIX/include/Python.h
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/sconstruct
branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jun 10 17:04:40 2014
@@ -1 +1 @@
-/trunk:1-23781
+/trunk:1-23789
Modified: branches/frame_order_cleanup/sconstruct
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/sconstruct?rev=23790&r1=23789&r2=23790&view=diff
==============================================================================
--- branches/frame_order_cleanup/sconstruct (original)
+++ branches/frame_order_cleanup/sconstruct Tue Jun 10 17:04:40 2014
@@ -573,7 +573,7 @@
py_include_fullpath = py_include_minpath + path.sep + 'python' +
`sys.version_info[0]` + '.' + `sys.version_info[1]`
# Test if Python.h resides here.
- f_name_pyth = py_include_minpath + path.sep + 'Python.h'
+ f_name_pyth = py_include_fullpath + path.sep + 'Python.h'
if not access(f_name_pyth, F_OK):
# Test if 'PYTHON_INCLUDE_DIR' has been set to system
environment.
Modified: branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py?rev=23790&r1=23789&r2=23790&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py
(original)
+++ branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py Tue
Jun 10 17:04:40 2014
@@ -78,7 +78,7 @@
self.tmpdir = ds.tmpdir
- def setup_bug_22146_unpacking_r2a_r2b_cluster(self, folder=None,
model_analyse=None):
+ def setup_bug_22146_unpacking_r2a_r2b_cluster(self, folder=None,
model_analyse=None, places = 7):
"""Setup data for the catch of U{bug
#22146<https://gna.org/bugs/?22146>}, the failure of unpacking R2A and R2B,
when performing a clustered full dispersion models.
@keyword folder: The name of the folder for the test data.
@@ -231,7 +231,7 @@
# Test chi2.
# At this point the chi-squared value at the solution should be
zero, as the relaxation data was created with the same parameter values.
- self.assertAlmostEqual(cur_spin.chi2, 0.0)
+ self.assertAlmostEqual(cur_spin.chi2, 0.0, places = places)
def setup_hansen_cpmg_data(self, model=None):
@@ -1014,7 +1014,7 @@
"""Catch U{bug #22146<https://gna.org/bugs/?22146>}, the failure of
unpacking R2A and R2B, when performing a clustered NS CPMG 2SITE STAR full
analysis."""
# Base data setup.
-
self.setup_bug_22146_unpacking_r2a_r2b_cluster(folder='ns_cpmg_2site_star_full',
model_analyse = MODEL_NS_CPMG_2SITE_STAR_FULL)
+
self.setup_bug_22146_unpacking_r2a_r2b_cluster(folder='ns_cpmg_2site_star_full',
model_analyse = MODEL_NS_CPMG_2SITE_STAR_FULL, places = 4)
def test_cpmg_synthetic_ns3d_to_cr72(self):
r23790 - in /branches/frame_order_cleanup: ./ sconstruct test_suite/system_tests/relax_disp.py