Hi Troels,
It would be much more useful if you create separate tests for each
model. This really is a huge benefit for future debugging, as
different code paths would be checked separately. I can't emphasise
enough how useful that would be. The simplest would be to rename the
test_bug_22146_unpacking_r2a_r2b_cluster() method to something like
setup_bug_22146_unpacking_r2a_r2b_cluster() so it is no longer a test,
and then create many test_bug_22146_unpacking_r2a_r2b_cluster_CR72(),
test_bug_22146_unpacking_r2a_r2b_cluster_B14(), etc. system tests
which consist of only a few lines of code (well really they can be one
line tests where you pass in the data path as an argument to the
setup_*() method :).
I also noticed that the system test is not ordered correctly:
$ grep "def test" test_suite/system_tests/relax_disp.py
def test_baldwin_synthetic(self):
def test_baldwin_synthetic_full(self):
def test_bug_21081_disp_cluster_fail(self):
def test_bug_21460_disp_cluster_fail(self):
def
test_bug_21344_sparse_time_spinlock_acquired_r1rho_fail_relax_disp(self):
def test_bug_21665_cpmg_two_fields_two_delaytimes_fail_calc(self):
def test_bug_21665_cpmg_two_fields_two_delaytimes_fail_relax_disp(self):
def test_bug_22146_unpacking_r2a_r2b_cluster(self):
def test_bug_21715_clustered_indexerror(self):
def test_cpmg_synthetic_ns3d_to_cr72(self):
[snip]
$
Thanks for catching and fixing this major bug!
Regards,
Edward
On 6 June 2014 17:26, <tlinnet@xxxxxxxxxxxxx> wrote:
Author: tlinnet
Date: Fri Jun 6 17:26:26 2014
New Revision: 23702
URL: http://svn.gna.org/viewcvs/relax?rev=23702&view=rev
Log:
Extended systemtest Relax_disp.test_bug_22146_unpacking_r2a_r2b_cluster for
B14 full model.
This is to catch the wrong un-packing of R2A and R2B when performing a
clustered full dispersion model analysis.
bug #22146: (https://gna.org/bugs/?22146) Unpacking of R2A and R2B is
performed wrong for clustered "full" dispersion models.
Added:
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_500.0_1_N.txt
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_500.0_2_N.txt
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_500.0_3_N.txt
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_500.0_4_N.txt
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_600.0_1_N.txt
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_600.0_2_N.txt
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_600.0_3_N.txt
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_600.0_4_N.txt
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_700.0_1_N.txt
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_700.0_2_N.txt
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_700.0_3_N.txt
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_700.0_4_N.txt
Modified:
trunk/test_suite/system_tests/relax_disp.py
[This mail would be too long, it was shortened to contain the URLs only.]
Added:
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_500.0_1_N.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_500.0_1_N.txt?rev=23702&view=auto
Added:
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_500.0_2_N.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_500.0_2_N.txt?rev=23702&view=auto
Added:
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_500.0_3_N.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_500.0_3_N.txt?rev=23702&view=auto
Added:
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_500.0_4_N.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_500.0_4_N.txt?rev=23702&view=auto
Added:
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_600.0_1_N.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_600.0_1_N.txt?rev=23702&view=auto
Added:
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_600.0_2_N.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_600.0_2_N.txt?rev=23702&view=auto
Added:
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_600.0_3_N.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_600.0_3_N.txt?rev=23702&view=auto
Added:
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_600.0_4_N.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_600.0_4_N.txt?rev=23702&view=auto
Added:
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_700.0_1_N.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_700.0_1_N.txt?rev=23702&view=auto
Added:
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_700.0_2_N.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_700.0_2_N.txt?rev=23702&view=auto
Added:
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_700.0_3_N.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_700.0_3_N.txt?rev=23702&view=auto
Added:
trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_700.0_4_N.txt
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/CPMG_700.0_4_N.txt?rev=23702&view=auto
Modified: trunk/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=23702&r1=23701&r2=23702&view=diff
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
relax-commits@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
Re: r23702 - in /trunk/test_suite: shared_data/dispersion/bug_22146_unpacking_r2a_r2b_cluster/B14_full/ system_tests/