Author: bugman
Date: Fri Sep 28 11:00:34 2012
New Revision: 17582
URL: http://svn.gna.org/viewcvs/relax?rev=17582&view=rev
Log:
Python 3 preparation - removed all xrange() calls from the unit tests, these
are not needed.
Modified:
trunk/test_suite/unit_tests/_generic_fns/_structure/test_api_base.py
trunk/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
trunk/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py
trunk/test_suite/unit_tests/_maths_fns/test_n_state_model.py
trunk/test_suite/unit_tests/_specific_fns/test_n_state_model.py
trunk/test_suite/unit_tests/relax_data_testing_base.py
trunk/test_suite/unit_tests/sequence_testing_base.py
Modified: trunk/test_suite/unit_tests/_generic_fns/_structure/test_api_base.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_generic_fns/_structure/test_api_base.py?rev=17582&r1=17581&r2=17582&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_generic_fns/_structure/test_api_base.py
(original)
+++ trunk/test_suite/unit_tests/_generic_fns/_structure/test_api_base.py Fri
Sep 28 11:00:34 2012
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2008 Edward d'Auvergne
#
+# Copyright (C) 2008-2012 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -58,7 +58,7 @@
defaults = ()
# Args.
- for i in xrange(len(args) - len(defaults)):
+ for i in range(len(args) - len(defaults)):
# Separator.
if i != 0:
text = text + ', '
@@ -70,7 +70,7 @@
index = i+1
# Keyword args.
- for i in xrange(index, len(defaults)+1):
+ for i in range(index, len(defaults)+1):
# Separator.
if i != 0:
text = text + ', '
Modified: trunk/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_generic_fns/_structure/test_internal.py?rev=17582&r1=17581&r2=17582&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_generic_fns/_structure/test_internal.py
(original)
+++ trunk/test_suite/unit_tests/_generic_fns/_structure/test_internal.py Fri
Sep 28 11:00:34 2012
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2008-2011 Edward d'Auvergne
#
+# Copyright (C) 2008-2012 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -237,7 +237,7 @@
z = [6.302, 7.391, 8.306, 7.526, 7.089, 6.087, 6.697, 5.822, 5.604,
7.943, 9.155, 7.752, 7.908, 8.829, 9.212, 8.407, 9.880, 10.560, 10.415,
9.754, 8.900, 6.374, 5.909, 5.719, 6.139, 4.391, 4.081, 4.415, 4.326, 5.367,
3.307, 2.640, 3.889, 4.956, 3.700, 3.430, 2.493, 2.814, 2.633, 1.449, 3.403,
3.572, 2.369, 2.281, 1.371, 0.855, 1.868, 0.359, 0.149, -0.269, -0.055,
-1.268, -1.726, -0.608, 0.037, -1.377, 0.162, 0.731, -2.354, -2.175, -3.496,
-3.603, -4.606, -4.199, -5.387, -5.803, -6.196, -4.563, -5.146, -4.350,
-3.001, -1.895, -1.241, -1.307, -2.472, -5.551, -5.582, -6.328, -6.269,
-7.274, -6.735, -7.913, -8.518, -7.133, -8.791, -9.871, -8.395, -8.346,
-8.584, -8.977, -8.732, -10.002, -10.355, -11.174, -11.584, -11.936, -10.759,
-11.425, -9.403, -8.469, -9.921, -11.030, -9.410, -8.336, -10.080, -9.428,
-10.291, -11.333, -11.606, -12.128, -10.723, -11.893, -9.781, -10.959,
-8.768, -7.344, -8.971, -9.765, -7.642, -7.816, -7.251, -6.715, -6.584,
-5.765, -7.175, -6.955, -9.288, -9.222, -9.654, -9.696, -10.009, -10.928,
-10.249, -10.194, -9.475, -11.596, -11.540, -11.813, -12.724, -13.193,
-13.137, -8.947, -7.774, -9.383, -10.338, -8.477, -8.138, -9.017, -7.265,
-6.226]
# Test the atomic data.
- for i in xrange(len(mol.atom_name)):
+ for i in range(len(mol.atom_name)):
self.assertEqual(mol.atom_name[i], atom_name[i])
self.assertEqual(mol.bonded[i], bonded[i])
self.assertEqual(mol.chain_id[i], chain_id[i])
Modified: trunk/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py?rev=17582&r1=17581&r2=17582&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py (original)
+++ trunk/test_suite/unit_tests/_generic_fns/test_mol_res_spin.py Fri Sep 28
11:00:34 2012
@@ -1714,7 +1714,7 @@
# The residues.
self.assertEqual(len(sel), 3)
- for i in xrange(3):
+ for i in range(3):
self.assertEqual(sel[i].name, names[i])
self.assertEqual(sel[i].num, numbers[i])
Modified: trunk/test_suite/unit_tests/_maths_fns/test_n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_maths_fns/test_n_state_model.py?rev=17582&r1=17581&r2=17582&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_maths_fns/test_n_state_model.py (original)
+++ trunk/test_suite/unit_tests/_maths_fns/test_n_state_model.py Fri Sep 28
11:00:34 2012
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2008-2009 Edward d'Auvergne
#
+# Copyright (C) 2008-2012 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -51,7 +51,7 @@
model = N_state_opt(model='2-domain', N=2, init_params=init_params,
full_tensors=full_tensors, red_data=red_data, red_errors=err,
full_in_ref_frame=full_in_ref_frame)
# Call the target function 3 times.
- for i in xrange(3):
+ for i in range(3):
# Target function.
chi2 = model.func_2domain(init_params)
@@ -79,7 +79,7 @@
model = N_state_opt(model='2-domain', N=2, init_params=init_params,
full_tensors=full_tensors, red_data=red_data, red_errors=err,
full_in_ref_frame=full_in_ref_frame)
# Call the target function 3 times.
- for i in xrange(3):
+ for i in range(3):
# Target function.
chi2 = model.func_2domain(init_params)
@@ -107,7 +107,7 @@
model = N_state_opt(model='2-domain', N=2, init_params=init_params,
full_tensors=full_tensors, red_data=red_data, red_errors=err,
full_in_ref_frame=full_in_ref_frame)
# Call the target function 3 times.
- for i in xrange(3):
+ for i in range(3):
# Target function.
chi2 = model.func_2domain(init_params)
@@ -135,7 +135,7 @@
model = N_state_opt(model='2-domain', N=2, init_params=init_params,
full_tensors=full_tensors, red_data=red_data, red_errors=err,
full_in_ref_frame=full_in_ref_frame)
# Call the target function 3 times.
- for i in xrange(3):
+ for i in range(3):
# Target function.
chi2 = model.func_2domain(init_params)
Modified: trunk/test_suite/unit_tests/_specific_fns/test_n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_specific_fns/test_n_state_model.py?rev=17582&r1=17581&r2=17582&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/_specific_fns/test_n_state_model.py (original)
+++ trunk/test_suite/unit_tests/_specific_fns/test_n_state_model.py Fri Sep
28 11:00:34 2012
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2008 Edward d'Auvergne
#
+# Copyright (C) 2008-2012 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -57,7 +57,7 @@
# Check the vector.
self.assertEqual(len(param_vector), len(vector_true))
- for i in xrange(len(param_vector)):
+ for i in range(len(param_vector)):
self.assertEqual(param_vector[i], vector_true[i])
Modified: trunk/test_suite/unit_tests/relax_data_testing_base.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/relax_data_testing_base.py?rev=17582&r1=17581&r2=17582&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/relax_data_testing_base.py (original)
+++ trunk/test_suite/unit_tests/relax_data_testing_base.py Fri Sep 28
11:00:34 2012
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2007-2011 Edward d'Auvergne
#
+# Copyright (C) 2007-2012 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -74,7 +74,7 @@
self.assertEqual(cdp.ri_ids[0], ri_id)
# Test the spin specific data.
- for i in xrange(len(cdp.mol[0].res)):
+ for i in range(len(cdp.mol[0].res)):
# The spin container.
spin = cdp.mol[0].res[i].spin[0]
Modified: trunk/test_suite/unit_tests/sequence_testing_base.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/sequence_testing_base.py?rev=17582&r1=17581&r2=17582&view=diff
==============================================================================
--- trunk/test_suite/unit_tests/sequence_testing_base.py (original)
+++ trunk/test_suite/unit_tests/sequence_testing_base.py Fri Sep 28 11:00:34
2012
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2007-2011 Edward d'Auvergne
#
+# Copyright (C) 2007-2012 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -133,7 +133,7 @@
dp = pipes.get_pipe('orig')
# Test the entire sequence.
- for i in xrange(len(self.Ap4Aase_res_num)):
+ for i in range(len(self.Ap4Aase_res_num)):
self.assertEqual(dp.mol[0].res[i].num, self.Ap4Aase_res_num[i])
self.assertEqual(dp.mol[0].res[i].name, self.Ap4Aase_res_name[i])
r17582 - in /trunk/test_suite/unit_tests: ./ _generic_fns/ _generic_fns/_structure/ _maths_fns/ _specific_fns/