Author: bugman
Date: Fri Mar 21 14:11:40 2008
New Revision: 5119
URL: http://svn.gna.org/viewcvs/relax?rev=5119&view=rev
Log:
Merged revisions 5117 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r5117 | bugman | 2008-03-21 13:49:16 +0100 (Fri, 21 Mar 2008) | 6 lines
Fix for bug #11004 (https://gna.org/bugs/?11004).
The division by zero is now caught and avoided, but this bug has been
triggered by a deeper problem
which is likely to uncover additional bugs.
........
Modified:
1.2/ (props changed)
1.2/generic_fns/monte_carlo.py
Propchange: 1.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar 21 14:11:40 2008
@@ -1,1 +1,1 @@
-/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299,3309,3312,3314,3318,3345,3372,4145,4473,4476,4939
+/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299,3309,3312,3314,3318,3345,3372,4145,4473,4476,4939,5117
Modified: 1.2/generic_fns/monte_carlo.py
URL:
http://svn.gna.org/viewcvs/relax/1.2/generic_fns/monte_carlo.py?rev=5119&r1=5118&r2=5119&view=diff
==============================================================================
--- 1.2/generic_fns/monte_carlo.py (original)
+++ 1.2/generic_fns/monte_carlo.py Fri Mar 21 14:11:40 2008
@@ -217,7 +217,10 @@
Xsum = Xsum + param_array[i]
# Calculate the mean parameter value for all simulations.
- Xav = Xsum / float(n)
+ if n == 0:
+ Xav = 0
+ else:
+ Xav = Xsum / float(n)
# Calculate the sum part of the standard deviation.
sd = 0.0
r5119 - in /1.2: ./ generic_fns/monte_carlo.py