Author: bugman
Date: Mon Oct 20 23:39:14 2008
New Revision: 7874
URL: http://svn.gna.org/viewcvs/relax?rev=7874&view=rev
Log:
Merged revisions 7837-7873 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r7866 | bugman | 2008-10-20 22:11:40 +0200 (Mon, 20 Oct 2008) | 7 lines
Bug fix for the LaTeX table generating script.
This was identified by Tyler Reddy "TREDDY at dal dot ca" in the message at
https://mail.gna.org/public/relax-users/2008-10/msg00062.html (Message-id:
<20081020162741.yimh96r4oq2ow4w0@xxxxxxxxxx>).
........
r7867 | bugman | 2008-10-20 22:28:02 +0200 (Mon, 20 Oct 2008) | 3 lines
Duplicated the latex_mf_table.py sample script for the creation of a system
test.
........
r7868 | bugman | 2008-10-20 22:45:41 +0200 (Mon, 20 Oct 2008) | 3 lines
Comment fix in the latex_mf_table.py sample script.
........
r7869 | bugman | 2008-10-20 22:46:37 +0200 (Mon, 20 Oct 2008) | 3 lines
Modified the latex_mf_table.py script for the test suite.
........
r7870 | bugman | 2008-10-20 22:51:27 +0200 (Mon, 20 Oct 2008) | 3 lines
Activated the model-free results to LaTeX table sample script.
........
r7871 | bugman | 2008-10-20 22:51:57 +0200 (Mon, 20 Oct 2008) | 3 lines
Missing import.
........
r7872 | bugman | 2008-10-20 22:59:45 +0200 (Mon, 20 Oct 2008) | 3 lines
Fix for the test_latex_table() system test.
........
r7873 | bugman | 2008-10-20 23:00:14 +0200 (Mon, 20 Oct 2008) | 3 lines
Fix for the latex_mf_table.py sample script. This matches the system test
fix in r7872.
........
Added:
branches/multi_processor_merge/test_suite/system_tests/scripts/latex_mf_table.py
- copied unchanged from r7873,
1.3/test_suite/system_tests/scripts/latex_mf_table.py
Modified:
branches/multi_processor_merge/ (props changed)
branches/multi_processor_merge/sample_scripts/latex_mf_table.py
branches/multi_processor_merge/test_suite/system_tests/model_free.py
Propchange: branches/multi_processor_merge/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Oct 20 23:39:14 2008
@@ -1,1 +1,1 @@
-/1.3:1-7836
+/1.3:1-7873
Modified: branches/multi_processor_merge/sample_scripts/latex_mf_table.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/sample_scripts/latex_mf_table.py?rev=7874&r1=7873&r2=7874&view=diff
==============================================================================
--- branches/multi_processor_merge/sample_scripts/latex_mf_table.py (original)
+++ branches/multi_processor_merge/sample_scripts/latex_mf_table.py Mon Oct
20 23:39:14 2008
@@ -33,7 +33,7 @@
\input{results}
"""
-# The relax data storage object.
+# relax module imports.
from generic_fns.mol_res_spin import spin_loop
from generic_fns import pipes
@@ -168,9 +168,9 @@
self.file.write("% The table body.\n")
# Loop over the spin systems.
- for spin, spin_id in spin_loop(return_id=True)
+ for spin, spin_id in spin_loop(return_id=True):
# The spin ID string.
- self.file.write("%-20s & " % (spin.name + `spin.num`))
+ self.file.write("%-20s & " % (spin_id))
# The spin is not selected.
if not spin.select:
Modified: branches/multi_processor_merge/test_suite/system_tests/model_free.py
URL:
http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/test_suite/system_tests/model_free.py?rev=7874&r1=7873&r2=7874&view=diff
==============================================================================
--- branches/multi_processor_merge/test_suite/system_tests/model_free.py
(original)
+++ branches/multi_processor_merge/test_suite/system_tests/model_free.py Mon
Oct 20 23:39:14 2008
@@ -155,6 +155,13 @@
# Test the model.
self.assertEqual(cdp.mol[0].res[1].spin[0].model, 'm4')
self.assertEqual(cdp.mol[0].res[1].spin[0].params, ['S2', 'te',
'Rex'])
+
+
+ def test_latex_table(self):
+ """Test the creation of a LaTeX table of model-free results,
mimicking the latex_mf_table.py sample script."""
+
+ # Execute the script.
+ self.relax.interpreter.run(script_file=sys.path[-1] +
'/test_suite/system_tests/scripts/latex_mf_table.py')
def test_omp_analysis(self):
r7874 - in /branches/multi_processor_merge: ./ sample_scripts/ test_suite/system_tests/ test_suite/system_tests/scripts/