1 diff -ur popi-0.9/rlranklib.py popi-0.9-rpy2/rlranklib.py
2 --- popi-0.9/rlranklib.py 2011-08-17 15:30:31.000000000 +0200
3 +++ popi-0.9-rpy2/rlranklib.py 2011-09-16 05:28:16.547000068 +0200
5 # $Header: /data/cvsroot/plportest/anadata/rlranklib.py,v 1.11.2.1 2007/11/26 08:46:29 lgh Exp $
9 +import rpy2.rpy_classic
10 +from rpy2.rpy_classic import *
11 from math import sqrt, log
14 +rpy2.rpy_classic.set_default_mode(rpy2.rpy_classic.BASIC_CONVERSION)
16 safe_eff = [None,1.365,1.208,1.116,1.110,1.104,1.064,1.064]
18 def calc_rlrank(lrs, opt_ranktype):
20 riag = [ rlranks[i] for i in range(0, len(rlranks)) if partition[i] == igrp ] # rlranks in a group
23 - threshold = r.qtukey(alpha, len(riag), 1000)*sqrt(1.0/12/nb)*len(riag)/len(rlranks)
24 + threshold = r.qtukey(alpha, len(riag), 1000)[0]*sqrt(1.0/12/nb)*len(riag)/len(rlranks)
25 range_ = max(riag) - min(riag)
27 print " ", igrp, len(riag), min(riag), max(riag), range_, "%.3f" % threshold,
31 # t = r.qtukey(alpha, len(arrs), 1000)*sqrt(1.0/12/nb)*(len(arrs)+1)/ksum
32 - t = r.qtukey(alpha, km, 1000) * sqrt((km*km-1)/12.0/nb) / ksum
33 + t = r.qtukey(alpha, km, 1000)[0] * sqrt((km*km-1)/12.0/nb) / ksum
34 if km <= len(safe_eff):
35 t = t * safe_eff[km-1]
36 if max(arrs) - min(arrs) > t:
37 Binary files popi-0.9/rlranklib.pyc and popi-0.9-rpy2/rlranklib.pyc differ