Author: bugman Date: Fri Jan 18 12:51:01 2013 New Revision: 18221 URL: http://svn.gna.org/viewcvs/relax?rev=18221&view=rev Log: Merged revisions 18209-18220 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r18209 | bugman | 2013-01-17 18:39:56 +0100 (Thu, 17 Jan 2013) | 6 lines The N-state model grid search optimises each tensor separately when only tensors are optimised. This massively collapses the grid search size from inc**(5*N) to N*inc**5, where inc are the number of increments per dimension and N is the number of alignments, making a grid search possible. ........ r18210 | bugman | 2013-01-18 10:42:26 +0100 (Fri, 18 Jan 2013) | 5 lines Created the N_state_model.test_mc_sim_failure system test to demonstrate a bug in the N-state model. This appears to be a problem with Monte Carlo simulations when data is missing. ........ r18211 | bugman | 2013-01-18 10:46:36 +0100 (Fri, 18 Jan 2013) | 6 lines Fix for the bug caught by the N_state_model.test_mc_sim_failure system test. If no RDC error is present, then the returned error from the N-state model analysis specific method return_error() is None. ........ r18212 | bugman | 2013-01-18 11:05:38 +0100 (Fri, 18 Jan 2013) | 5 lines Modified the N_state_model.test_mc_sim_failure system test to include missing PCS data. This is to catch another bug. ........ r18213 | bugman | 2013-01-18 11:07:40 +0100 (Fri, 18 Jan 2013) | 5 lines Fix for the missing PCS data in the N-state model Monte Carlo simulations. This was caught by the N_state_model.test_mc_sim_failure system test. ........ r18214 | bugman | 2013-01-18 11:41:50 +0100 (Fri, 18 Jan 2013) | 5 lines Modified the missing data system test script to include Monte Carlo simulations. This is to cover untested code paths. ........ r18215 | bugman | 2013-01-18 11:51:40 +0100 (Fri, 18 Jan 2013) | 5 lines Added calls to rdc.set_errors and pcs.set_errors in the missing data N-state model system test script. These user functions currently do not exist, but are needed as the data files contain no errors. ........ r18216 | bugman | 2013-01-18 12:14:17 +0100 (Fri, 18 Jan 2013) | 3 lines Implemented the rdc.set_errors user function. ........ r18217 | bugman | 2013-01-18 12:21:25 +0100 (Fri, 18 Jan 2013) | 3 lines Implemented the pcs.set_error user function. ........ r18218 | bugman | 2013-01-18 12:23:34 +0100 (Fri, 18 Jan 2013) | 3 lines Removed a debugging commenting out in the pcs.set_errors user function definition. ........ r18219 | bugman | 2013-01-18 12:43:24 +0100 (Fri, 18 Jan 2013) | 3 lines Fix for the N_state_model.test_mc_sim_failure GUI test - the relax data store was not empty at the start. ........ r18220 | bugman | 2013-01-18 12:46:24 +0100 (Fri, 18 Jan 2013) | 7 lines Modified all generic_fns.mol_res_spin.get_*() functions to handle no data pipes being present. These functions were previously raising RelaxErrors as no pipes were present. They now return empty lists instead. This allows many of the GUI user functions to open in the GUI when no data is present, allowing better debugging and less confusion for the user. ........ Added: branches/frame_order_testing/test_suite/shared_data/saved_states/n_state_model_mc_fail.bz2 - copied unchanged from r18220, trunk/test_suite/shared_data/saved_states/n_state_model_mc_fail.bz2 Modified: branches/frame_order_testing/ (props changed) branches/frame_order_testing/generic_fns/mol_res_spin.py branches/frame_order_testing/generic_fns/pcs.py branches/frame_order_testing/generic_fns/rdc.py branches/frame_order_testing/specific_fns/n_state_model.py branches/frame_order_testing/test_suite/system_tests/n_state_model.py branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/missing_data_test.py branches/frame_order_testing/user_functions/pcs.py branches/frame_order_testing/user_functions/rdc.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/frame_order_testing/generic_fns/mol_res_spin.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/mol_res_spin.py?rev=18221&r1=18220&r2=18221&view=diff Modified: branches/frame_order_testing/generic_fns/pcs.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/pcs.py?rev=18221&r1=18220&r2=18221&view=diff Modified: branches/frame_order_testing/generic_fns/rdc.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/rdc.py?rev=18221&r1=18220&r2=18221&view=diff Modified: branches/frame_order_testing/specific_fns/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/n_state_model.py?rev=18221&r1=18220&r2=18221&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/n_state_model.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/n_state_model.py?rev=18221&r1=18220&r2=18221&view=diff Modified: branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/missing_data_test.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/n_state_model/missing_data_test.py?rev=18221&r1=18220&r2=18221&view=diff Modified: branches/frame_order_testing/user_functions/pcs.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/user_functions/pcs.py?rev=18221&r1=18220&r2=18221&view=diff Modified: branches/frame_order_testing/user_functions/rdc.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/user_functions/rdc.py?rev=18221&r1=18220&r2=18221&view=diff