r24857 - /trunk/specific_analyses/relax_disp/optimisation.py -- July 30, 2014 - 21:03

Author: tlinnet
Date: Wed Jul 30 21:03:11 2014
New Revision: 24857

URL: http://svn.gna.org/viewcvs/relax?rev=24857&view=rev
Log:
Fix for replacing reduce function.

This is a Python 3 fix, where this function has been removed.

This was reported as a necessity in thread:
http://thread.gmane.org/gmane.science.nmr.relax.devel/6544

Modified:
    trunk/specific_analyses/relax_disp/optimisation.py

Modified: trunk/specific_analyses/relax_disp/optimisation.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/optimisation.py?rev=24857&r1=24856&r2=24857&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/optimisation.py  (original)
+++ trunk/specific_analyses/relax_disp/optimisation.py  Wed Jul 30 21:03:11 
2014
@@ -322,7 +322,10 @@
 
                 # Grid search printout.
                 if match('^[Gg]rid', min_algor):
-                    print("Unconstrained grid search size: %s (constraints 
may decrease this size).\n" % reduce(mul, inc, 1))
+                    result = 1
+                    for x in inc:
+                        result = mul(result, x)
+                    print("Unconstrained grid search size: %s (constraints 
may decrease this size).\n" % result)
 
             # The peak intensities, errors and times.
             values = []
@@ -552,7 +555,10 @@
 
             # Grid search printout.
             if search('^[Gg]rid', self.min_algor):
-                print("Unconstrained grid search size: %s (constraints may 
decrease this size).\n" % reduce(mul, self.inc, 1))
+                result = 1
+                for x in self.inc:
+                    result = mul(result, x)
+                print("Unconstrained grid search size: %s (constraints may 
decrease this size).\n" % result)
 
         # Initialise the function to minimise.
         model = Dispersion(model=self.spins[0].model, 
num_params=self.param_num, num_spins=count_spins(self.spins), 
num_frq=len(self.fields), exp_types=self.exp_types, values=self.values, 
errors=self.errors, missing=self.missing, frqs=self.frqs, frqs_H=self.frqs_H, 
cpmg_frqs=self.cpmg_frqs, spin_lock_nu1=self.spin_lock_nu1, 
chemical_shifts=self.chemical_shifts, offset=self.offsets, 
tilt_angles=self.tilt_angles, r1=self.r1, relax_times=self.relax_times, 
scaling_matrix=self.scaling_matrix)