r25631 - in /trunk/test_suite: shared_data/curve_fitting/numeric_topology/ system_tests/ -- September 04, 2014 - 16:35

Author: bugman
Date: Thu Sep  4 16:35:35 2014
New Revision: 25631

URL: http://svn.gna.org/viewcvs/relax?rev=25631&view=rev
Log:
Ported r25629 from the 3.3.0 tag.

The command used was:
svn merge -r25628:25629 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/3.3.0 .

.....
  r25629 | bugman | 2014-09-04 16:31:00 +0200 (Thu, 04 Sep 2014) | 6 lines
  Changed paths:
     M 
/tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py
     M 
/tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py
     M 
/tags/3.3.0/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
     M /tags/3.3.0/test_suite/system_tests/relax_disp.py
  
  Python 3 fixes via the 2to3 compatibility script.
  
  The command used was:
  2to3 -w -f except -f import -f imports -f long -f numliterals -f xrange .
.....


Modified:
    
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py
    
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py
    
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
    trunk/test_suite/system_tests/relax_disp.py

Modified: 
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py?rev=25631&r1=25630&r2=25631&view=diff
==============================================================================
--- 
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py
      (original)
+++ 
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors.py
      Thu Sep  4 16:35:35 2014
@@ -9,7 +9,7 @@
 from random import gauss, sample, randint, randrange
 from collections import OrderedDict
 #import pickle
-import cPickle as pickle
+import pickle as pickle
 
 # Should warnings be raised to errors?
 raise_warnings = False

Modified: 
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py?rev=25631&r1=25630&r2=25631&view=diff
==============================================================================
--- 
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py
      (original)
+++ 
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse.py
      Thu Sep  4 16:35:35 2014
@@ -4,7 +4,7 @@
 # Python module imports.
 from collections import OrderedDict
 #import pickle
-import cPickle as pickle
+import pickle as pickle
 from numpy import array, asarray, diag, ones, std, sqrt
 from os import getcwd, makedirs, path, sep
 

Modified: 
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py?rev=25631&r1=25630&r2=25631&view=diff
==============================================================================
--- 
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
        (original)
+++ 
trunk/test_suite/shared_data/curve_fitting/numeric_topology/estimate_errors_analyse_relax.py
        Thu Sep  4 16:35:35 2014
@@ -1,7 +1,7 @@
 # Python module imports.
 from collections import OrderedDict
 #import pickle
-import cPickle as pickle
+import pickle as pickle
 from numpy import array, asarray, diag, ones, std, sqrt
 from numpy.random import normal
 from minfx.generic import generic_minimise
@@ -90,7 +90,7 @@
     for j in range(nt):
          spectrum_id_list.append('%iZ_A%i'%(i, j))
     file_name = "ntmax_%i_disp_%i.ser" % (nt_max, i)
-    spectrum.read_intensities(file=file_name, dir=data_path, 
spectrum_id=spectrum_id_list, int_method='height', int_col=range(nt))
+    spectrum.read_intensities(file=file_name, dir=data_path, 
spectrum_id=spectrum_id_list, int_method='height', int_col=list(range(nt)))
 
     for j in range(nt):
         spectrum_id = '%iZ_A%i'%(i, j)

Modified: trunk/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=25631&r1=25630&r2=25631&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Thu Sep  4 16:35:35 2014
@@ -8330,7 +8330,7 @@
 
 
         # Make Carlo Simulations number
-        mc_number_list = range(0, 1000, 250)
+        mc_number_list = list(range(0, 1000, 250))
 
         sim_attr_list = ['chi2_sim', 'f_count_sim', 'g_count_sim', 
'h_count_sim', 'i0_sim', 'iter_sim', 'peak_intensity_sim', 'r2eff_sim', 
'select_sim', 'warning_sim']