svn+ssh://bugman@.../svn/relax/trunk
........
r19297 | bugman | 2013-04-02 11:44:35 +0200 (Tue, 02 Apr 2013) | 78 lines
Manually merged r19291, r19292, r19293, r19294, r19295, r19296 from the 2.2 line to trunk.
The command used was:
svn merge -r19290:19296 svn+ssh://bugman@.../svn/relax/branches/2.2 .
.....
------------------------------------------------------------------------
r19296 | bugman | 2013-04-02 11:41:09 +0200 (Tue, 02 Apr 2013) | 5 lines
Changed paths:
M /branches/2.2/test_suite/system_tests/scripts/bug_20674_jw_mapping.py
Fix for the Jw.test_bug_20674_jw_mapping system test.
The parameter f_eta is for consistency testing and not J(w) mapping.
------------------------------------------------------------------------
r19295 | bugman | 2013-04-02 11:39:55 +0200 (Tue, 02 Apr 2013) | 5 lines
Changed paths:
M /branches/2.2/test_suite/system_tests/scripts/bug_20674_jw_mapping.py
Converted the bug_20674_jw_mapping.py system test script to use the self._execute_uf() interface.
This allows the script to be used in the GUI.
------------------------------------------------------------------------
r19294 | bugman | 2013-04-02 11:33:22 +0200 (Tue, 02 Apr 2013) | 5 lines
Changed paths:
M /branches/2.2/test_suite/system_tests/scripts/consistency_tests.py
M /branches/2.2/test_suite/system_tests/scripts/curve_fitting/bug_19887_curvefit_fail.py
M /branches/2.2/test_suite/system_tests/scripts/jw_mapping.py
M /branches/2.2/test_suite/system_tests/scripts/model_free/bug_14941_local_tm_global_selection.py
System test speed ups - decreased the number of Monte Carlo simulations in many tests.
Running 500 simulation optimisations in a system test is a total waste of time!
------------------------------------------------------------------------
r19293 | bugman | 2013-04-02 11:27:32 +0200 (Tue, 02 Apr 2013) | 5 lines
Changed paths:
M /branches/2.2/specific_analyses/jw_mapping.py
Fix for the J(w) mapping analysis matching that of r19284 for the consistency testing.
The overfit_deselect() method is now identical to that of the consistency testing analysis.
------------------------------------------------------------------------
------------------------------------------------------------------------
r19292 | bugman | 2013-04-02 11:23:09 +0200 (Tue, 02 Apr 2013) | 8 lines
Changed paths:
M /branches/2.2/test_suite/system_tests/jw_mapping.py
A /branches/2.2/test_suite/system_tests/scripts/bug_20674_jw_mapping.py (from /branches/2.2/test_suite/system_tests/scripts/bug_20674_ct_analysis_failure.py:19284)
Created the Jw.bug_20674_jw_mapping system test.
This is a modification of the Ct.test_bug_20674_ct_analysis_failure system test for catching bug
#20674 (https://gna.org/bugs/?20674). The test script was duplicated and the small modifications
made to convert it into the J(w) mapping analysis. This now reveals the same bug but for the J(w)
mapping analysis.
------------------------------------------------------------------------
r19291 | bugman | 2013-04-02 11:11:11 +0200 (Tue, 02 Apr 2013) | 5 lines
Changed paths:
M /branches/2.2/specific_analyses/model_free/main.py
Fix for the model-free analysis specific overfit_deselect() method.
The tests for the presence of dipolar relaxation was not correct and was non-functional.
------------------------------------------------------------------------
.....
........
