Author: bugman
Date: Mon Jul 28 11:05:01 2014
New Revision: 24779
URL: http://svn.gna.org/viewcvs/relax?rev=24779&view=rev
Log:
Merged revisions 24755-24757 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r24755 | bugman | 2014-07-25 16:51:16 +0200 (Fri, 25 Jul 2014) | 3 lines
Deleted the ancient optimisation_testing.py script, as this no longer works
and is of no use.
........
r24756 | bugman | 2014-07-25 16:59:22 +0200 (Fri, 25 Jul 2014) | 3 lines
Some changes as identified by the Python 2 to 3 upgrade script
/usr/bin/2to3.
........
r24757 | bugman | 2014-07-25 17:12:32 +0200 (Fri, 25 Jul 2014) | 3 lines
Some Python 3 fixes as identified by the 2to3 script.
........
Removed:
branches/frame_order_cleanup/devel_scripts/optimisation_testing.py
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/disp_profile_all.py
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/disp_profile_single.py
branches/frame_order_cleanup/test_suite/unit_tests/_lib/_dispersion/test_matrix_exponential.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jul 28 11:05:01 2014
@@ -1 +1 @@
-/trunk:1-24752
+/trunk:1-24778
Removed: branches/frame_order_cleanup/devel_scripts/optimisation_testing.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/devel_scripts/optimisation_testing.py?rev=24778&view=auto
==============================================================================
--- branches/frame_order_cleanup/devel_scripts/optimisation_testing.py
(original)
+++ branches/frame_order_cleanup/devel_scripts/optimisation_testing.py
(removed)
@@ -1,54 +0,0 @@
-# Script for testing optimisation for software version and architecture
differences.
-
-# Python module imports.
-from re import search
-import sys
-
-# relax module imports.
-from test_suite.system_tests import model_free
-
-# The testing class.
-mf = model_free.Mf('run')
-
-# Execute the tests, storing the messages.
-tests = []
-messages = []
-for name in dir(mf):
- # Skip all non-opt tests.
- if not search('test_opt', name):
- continue
-
- # Print out.
- sys.stderr.write("Test: %s\n" % name)
-
- # Set up.
- mf.setUp()
-
- # Run the test.
- test = getattr(mf, name)
- test()
-
- # Alias the relevent spin container.
- spin = cdp.mol[0].res[1].spin[0]
-
- # Get the message.
- tests.append(name)
- messages.append(mf.mesg_opt_debug(spin).split('\n'))
-
- # Tear down.
- mf.tearDown()
-
-# Write the messages to STDERR.
-for i in range(len(messages)):
- # Header.
- sys.stderr.write("\n\n\n\nTest: %s\n" % tests[i])
-
- # The message lines.
- for j in range(len(messages[i])):
- # Clean up.
- if j < 2 or j == len(messages[i]) - 1:
- continue
-
- # Write the line.
- sys.stderr.write(" # %s\n" % messages[i][j])
-sys.stderr.write("\n\n")
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/disp_profile_all.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/disp_profile_all.py?rev=24779&r1=24778&r2=24779&view=diff
==============================================================================
---
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/disp_profile_all.py
(original)
+++
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/disp_profile_all.py
Mon Jul 28 11:05:01 2014
@@ -235,7 +235,7 @@
cpmg_points = []
cpmg_points_nr = 0
-spin_lock_offsets = range(10)
+spin_lock_offsets = list(range(10))
spin_lock_fields = [431.0, 651.2, 800.5, 984.0, 1341.11]
r1rho_points = []
r1rho_points_nr = 0
Modified:
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/disp_profile_single.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/disp_profile_single.py?rev=24779&r1=24778&r2=24779&view=diff
==============================================================================
---
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/disp_profile_single.py
(original)
+++
branches/frame_order_cleanup/test_suite/shared_data/dispersion/profiling/disp_profile_single.py
Mon Jul 28 11:05:01 2014
@@ -185,7 +185,7 @@
cpmg_points = []
cpmg_points_nr = 0
-spin_lock_offsets = range(10)
+spin_lock_offsets = list(range(10))
spin_lock_fields = [431.0, 651.2, 800.5, 984.0, 1341.11]
r1rho_points = []
r1rho_points_nr = 0
Modified:
branches/frame_order_cleanup/test_suite/unit_tests/_lib/_dispersion/test_matrix_exponential.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/unit_tests/_lib/_dispersion/test_matrix_exponential.py?rev=24779&r1=24778&r2=24779&view=diff
==============================================================================
---
branches/frame_order_cleanup/test_suite/unit_tests/_lib/_dispersion/test_matrix_exponential.py
(original)
+++
branches/frame_order_cleanup/test_suite/unit_tests/_lib/_dispersion/test_matrix_exponential.py
Mon Jul 28 11:05:01 2014
@@ -182,10 +182,10 @@
diff_A_neg_imag_sum = sum(diff_A_neg_imag)
# Test that the sum difference is zero.
- self.assertAlmostEqual(diff_A_pos_real_sum , 0.0, 6)
- self.assertAlmostEqual(diff_A_pos_imag_sum , 0.0, 6)
- self.assertAlmostEqual(diff_A_neg_real_sum , 0.0, 6)
- self.assertAlmostEqual(diff_A_neg_imag_sum , 0.0, 6)
+ self.assertAlmostEqual(diff_A_pos_real_sum, 0.0, 6)
+ self.assertAlmostEqual(diff_A_pos_imag_sum, 0.0, 6)
+ self.assertAlmostEqual(diff_A_neg_real_sum, 0.0, 6)
+ self.assertAlmostEqual(diff_A_neg_imag_sum, 0.0, 6)
def test_ns_mmq_2site_korzhnev_2005_15n_dq_data_complex128(self):
r24779 - in /branches/frame_order_cleanup: ./ devel_scripts/ test_suite/shared_data/dispersion/profiling/ test_suite/unit_te...