https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114810
Revision: 114810
Author: giovanni
Date: 2012-04-09 18:58:48 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
small fixes to lifecycle.models and lifecycle.scale
Modified Paths:
--------------
trunk/tools/wsor/editor_lifecycle/lifecycle/models.py
trunk/tools/wsor/editor_lifecycle/lifecycle/scale.py
Modified: trunk/tools/wsor/editor_lifecycle/lifecycle/models.py
===================================================================
--- trunk/tools/wsor/editor_lifecycle/lifecycle/models.py 2012-04-09
18:58:45 UTC (rev 114809)
+++ trunk/tools/wsor/editor_lifecycle/lifecycle/models.py 2012-04-09
18:58:48 UTC (rev 114810)
@@ -348,6 +348,7 @@
if __name__ == '__main__':
import matplotlib.pyplot as pp
+ from matplotlib.font_manager import FontProperties
import scale
model = StretchedExpon()
@@ -373,15 +374,15 @@
pp.xscale('power', exponent=beta)
pp.yscale('log')
- pp.legend()
gof, resid, Rsquared = model.gof(x, y, s)
model.goftest = gof
model.residtest = resid
model.Rsquared = Rsquared
print model.summary()
chi, p, ddof = gof
- pp.text(200, 1, r'$\chi^2 = %.2f,\, p-{\rm value} = %5.2g,\,'
+ pp.text(1, 2e-3, r'$\chi^2 = %.2f,\, p = %5.2g,\,'
r'{\rm ddof} = %d,\, R^2 = %.2f$'
% (chi,p,ddof, Rsquared),
- fontsize=16)
+ fontsize=10)
+ pp.legend(loc='best', prop=FontProperties(size='x-small'))
pp.show()
Modified: trunk/tools/wsor/editor_lifecycle/lifecycle/scale.py
===================================================================
--- trunk/tools/wsor/editor_lifecycle/lifecycle/scale.py 2012-04-09
18:58:45 UTC (rev 114809)
+++ trunk/tools/wsor/editor_lifecycle/lifecycle/scale.py 2012-04-09
18:58:48 UTC (rev 114810)
@@ -57,7 +57,7 @@
def __init__(self, exponent):
self.exponent = exponent
def __call__(self, x, pos=None):
- return u'%.2g' % (x ** (1.0 / self.exponent))
+ return '%.3g' % x
class PowerTransform(Transform):
input_dims = 1
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
