Mailman 3 February 2004 - Python-checkins

python/nondist/sandbox/statistics statistics.py, 1.6, 1.7
by rhettinger＠users.sourceforge.net 17 Feb '04

17 Feb '04

Update of /cvsroot/python/python/nondist/sandbox/statistics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7892 Modified Files: statistics.py Log Message: Limit randomization to just the selection of the pivot rather than shuffling the whole dataset. Index: statistics.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/statistics/statistics.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** statistics.py 17 Feb 2004 13:00:16 -0000 1.6 --- statistics.py 17 Feb 2004 17:39:26 -0000 1.7 *************** *** 91,95 **** """ try: - shuffled = False while True: it = iter(data) --- 91,94 ---- *************** *** 109,115 **** data = notunder n -= len(under) + 1 ! if not shuffled and len(data)>8 and min(len(under), len(notunder)) == 0: ! random.shuffle(data) ! shuffled = True except StopIteration: raise ValueError('not enough elements for the given rank') --- 108,114 ---- data = notunder n -= len(under) + 1 ! if len(data) > 3: ! swap = random.randrange(len(data)) ! data[0], data[swap] = data[swap], data[0] except StopIteration: raise ValueError('not enough elements for the given rank')

1 0

python/nondist/sandbox/statistics statistics.py, 1.5, 1.6 test_statistics.py, 1.1, 1.2
by rhettinger＠users.sourceforge.net 17 Feb '04

17 Feb '04

Update of /cvsroot/python/python/nondist/sandbox/statistics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14804 Modified Files: statistics.py test_statistics.py Log Message: Have select() use randomization to overcome degenerate cases. Index: statistics.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/statistics/statistics.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** statistics.py 17 Feb 2004 12:17:41 -0000 1.5 --- statistics.py 17 Feb 2004 13:00:16 -0000 1.6 *************** *** 25,28 **** --- 25,29 ---- import heapq import bisect + import random __all__ = ['mean', 'median', 'nlargest', 'nsmallest', *************** *** 90,98 **** """ try: while True: - under, notunder = [], [] - ua, nua = under.append, notunder.append it = iter(data) pivot = it.next() for elem in it: if elem < pivot: --- 91,100 ---- """ try: + shuffled = False while True: it = iter(data) pivot = it.next() + under, notunder = [], [] + ua, nua = under.append, notunder.append for elem in it: if elem < pivot: *************** *** 107,110 **** --- 109,115 ---- data = notunder n -= len(under) + 1 + if not shuffled and len(data)>8 and min(len(under), len(notunder)) == 0: + random.shuffle(data) + shuffled = True except StopIteration: raise ValueError('not enough elements for the given rank') Index: test_statistics.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/statistics/test_statistics.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** test_statistics.py 15 Feb 2004 06:03:57 -0000 1.1 --- test_statistics.py 17 Feb 2004 13:00:16 -0000 1.2 *************** *** 58,61 **** --- 58,74 ---- self.assertEqual(select(a, nth), nth) + # Try with sorted data + a = range(n) + for i in xrange(100): + nth = random.randrange(n) + self.assertEqual(select(a, nth), nth) + + # Try with reverse sorted data + a = range(n) + a.reverse() + for i in xrange(100): + nth = random.randrange(n) + self.assertEqual(select(a, nth), nth) + def test_nlargest(self): n = 10

1 0

python/nondist/sandbox/statistics statistics.py, 1.4, 1.5
by rhettinger＠users.sourceforge.net 17 Feb '04

17 Feb '04

Update of /cvsroot/python/python/nondist/sandbox/statistics In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6746 Modified Files: statistics.py Log Message: Simplify the select() function. Index: statistics.py =================================================================== RCS file: /cvsroot/python/python/nondist/sandbox/statistics/statistics.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** statistics.py 15 Feb 2004 08:25:20 -0000 1.4 --- statistics.py 17 Feb 2004 12:17:41 -0000 1.5 *************** *** 86,126 **** return (s / k) ** 0.5 # population standard deviation - def _partition(iterable): - """ Private function supporting select() - - Chooses the first element as pivot and returns tuple with a - list of values less than the pivot, the pivot itself, and a - a list of values not less than the pivot. - """ - - under, notunder = [], [] - ua, nua = under.append, notunder.append - it = iter(iterable) - pivot = it.next() # must have at least one element - for elem in it: - if elem < pivot: - ua(elem) - else: - nua(elem) - return under, pivot, notunder - def select(data, n): ! """Find the nth rank ordered element (the least value has rank 0).""" try: ! size = len(data) ! except TypeError: ! data = tuple(data) ! size = len(data) ! if size <= n: raise ValueError('not enough elements for the given rank') - while True: - p, pivot, q = _partition(data) - if n < len(p): - data = p - elif n == len(p): - return pivot - else: - data = q - n -= len(p) + 1 def median(data): --- 86,112 ---- return (s / k) ** 0.5 # population standard deviation def select(data, n): ! """Find the nth rank ordered element (the least value has rank 0). ! """ try: ! while True: ! under, notunder = [], [] ! ua, nua = under.append, notunder.append ! it = iter(data) ! pivot = it.next() ! for elem in it: ! if elem < pivot: ! ua(elem) ! else: ! nua(elem) ! if n < len(under): ! data = under ! elif n == len(under): ! return pivot ! else: ! data = notunder ! n -= len(under) + 1 ! except StopIteration: raise ValueError('not enough elements for the given rank') def median(data):

1 0

Google adwords - A license to print money
by Percy Samuel 17 Feb '04

17 Feb '04

1 0

[Python-checkins] python/dist/src/Doc/whatsnew whatsnew24.tex, 1.34, 1.35
by rhettinger＠users.sourceforge.net 17 Feb '04

17 Feb '04

Update of /cvsroot/python/python/dist/src/Doc/whatsnew In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22155 Modified Files: whatsnew24.tex Log Message: Mention the optimization of list.extend(). Index: whatsnew24.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/whatsnew/whatsnew24.tex,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** whatsnew24.tex 14 Feb 2004 18:34:45 -0000 1.34 --- whatsnew24.tex 17 Feb 2004 10:46:32 -0000 1.35 *************** *** 268,271 **** --- 268,273 ---- benefit. The amount of improvement varies between systems and shows the greatest improvement on systems with poor realloc() implementations. + \method{list.extend()} was also optimized and no longer converts its + argument into a temporary list prior to extending the base list. \item \function{list()}, \function{tuple()}, \function{map()},

1 0

python/dist/src/Doc/api newtypes.tex,1.29,1.30
by fdrake＠users.sourceforge.net 17 Feb '04

17 Feb '04

Update of /cvsroot/python/python/dist/src/Doc/api In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22366 Modified Files: newtypes.tex Log Message: markup correction Index: newtypes.tex =================================================================== RCS file: /cvsroot/python/python/dist/src/Doc/api/newtypes.tex,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** newtypes.tex 15 Feb 2004 21:01:17 -0000 1.29 --- newtypes.tex 17 Feb 2004 04:17:36 -0000 1.30 *************** *** 1397,1401 **** tp_dealloc is called will own the Global Interpreter Lock (GIL). However, if the object being destroyed in turn destroys objects from ! some other C or C++ library, care should be taken to ensure that destroying those objects on the thread which called tp_dealloc will not violate any assumptions of the library. --- 1397,1401 ---- tp_dealloc is called will own the Global Interpreter Lock (GIL). However, if the object being destroyed in turn destroys objects from ! some other C or \Cpp{} library, care should be taken to ensure that destroying those objects on the thread which called tp_dealloc will not violate any assumptions of the library.

1 0

python/dist/src/Python newcompile.c, 1.1.2.74, 1.1.2.75
by jhylton＠users.sourceforge.net 16 Feb '04

16 Feb '04

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18239 Modified Files: Tag: ast-branch newcompile.c Log Message: Fix for lnotab generation. (See last line of patch.) The offset of the last bytecode with a line number wasn't being updated, so the lnotab was generating bogus values with very large address increments. Index: newcompile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/newcompile.c,v retrieving revision 1.1.2.74 retrieving revision 1.1.2.75 diff -C2 -d -r1.1.2.74 -r1.1.2.75 *** newcompile.c 16 Feb 2004 04:07:24 -0000 1.1.2.74 --- newcompile.c 16 Feb 2004 22:11:34 -0000 1.1.2.75 *************** *** 42,45 **** --- 42,47 ---- #: yield or return outside a function don't raise a SyntaxError #: line numbers are off a bit (may just need to add calls to set lineno) + In some cases, the line numbers for generated code aren't strictly + increasing. This breaks the lnotab. #: Modules/parsermodule.c:496: warning: implicit declaration of function `PyParser_SimpleParseString' *************** *** 582,586 **** c->u->u_lineno_set = true; b = c->u->u_blocks[c->u->u_curblock]; ! b->b_instr[off].i_lineno = c->u->u_lineno; } --- 584,588 ---- c->u->u_lineno_set = true; b = c->u->u_blocks[c->u->u_curblock]; ! b->b_instr[off].i_lineno = c->u->u_lineno; } *************** *** 594,598 **** if (off < 0) return 0; - compiler_set_lineno(c, off); b = c->u->u_blocks[c->u->u_curblock]; i = &b->b_instr[off]; --- 596,599 ---- *************** *** 601,604 **** --- 602,606 ---- if (opcode == RETURN_VALUE) b->b_return = 1; + compiler_set_lineno(c, off); return 1; } *************** *** 650,658 **** if (off < 0) return 0; - compiler_set_lineno(c, off); i = &c->u->u_blocks[c->u->u_curblock]->b_instr[off]; i->i_opcode = opcode; i->i_oparg = oparg; i->i_hasarg = 1; return 1; } --- 652,660 ---- if (off < 0) return 0; i = &c->u->u_blocks[c->u->u_curblock]->b_instr[off]; i->i_opcode = opcode; i->i_oparg = oparg; i->i_hasarg = 1; + compiler_set_lineno(c, off); return 1; } *************** *** 2442,2445 **** --- 2444,2452 ---- d_lineno = i->i_lineno - a->a_lineno; + /* setup.py's get_platform() causes these asserts to fail. + assert(d_bytecode >= 0); + assert(d_lineno >= 0); + */ + if (d_lineno == 0) return 1; *************** *** 2502,2505 **** --- 2509,2513 ---- } a->a_lineno = i->i_lineno; + a->a_lineno_off = a->a_offset; return 1; }

1 0

75.H. permanent enlargment
by Beulah Baxter 16 Feb '04

16 Feb '04

the next girl you bang will start calling you John Holmes... http://4eddbed.com/vp5 take off- http://trepidation.diffrs.com/a.html donate digitate quicksand

1 0

python/dist/src/Modules socketmodule.c, 1.284, 1.285
by anthonybaxter＠users.sourceforge.net 16 Feb '04

16 Feb '04

Update of /cvsroot/python/python/dist/src/Modules In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17380 Modified Files: socketmodule.c Log Message: Make socketmodule compile again on a modern Linux (that supports Bluetooth). The Bluetooth code was obviously never tested on Linux. Index: socketmodule.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Modules/socketmodule.c,v retrieving revision 1.284 retrieving revision 1.285 diff -C2 -d -r1.284 -r1.285 *** socketmodule.c 10 Feb 2004 16:50:19 -0000 1.284 --- socketmodule.c 16 Feb 2004 05:35:28 -0000 1.285 *************** *** 332,336 **** #define _BT_RC_MEMB(sa, memb) ((sa)->rfcomm_##memb) #else ! #define _BT_SOCKADDRMEMB(s, proto) (&((s)->sock_addr).bt_##proto) #define _BT_L2_MEMB(sa, memb) ((sa)->l2_##memb) #define _BT_RC_MEMB(sa, memb) ((sa)->rc_##memb) --- 332,336 ---- #define _BT_RC_MEMB(sa, memb) ((sa)->rfcomm_##memb) #else ! #define _BT_SOCKADDR_MEMB(s, proto) (&((s)->sock_addr).bt_##proto) #define _BT_L2_MEMB(sa, memb) ((sa)->l2_##memb) #define _BT_RC_MEMB(sa, memb) ((sa)->rc_##memb)

1 0

python/dist/src/Python newcompile.c, 1.1.2.73, 1.1.2.74
by jhylton＠users.sourceforge.net 16 Feb '04

16 Feb '04

Update of /cvsroot/python/python/dist/src/Python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3381 Modified Files: Tag: ast-branch newcompile.c Log Message: Extend compute_code_flags() to set CO_NOFREE. Index: newcompile.c =================================================================== RCS file: /cvsroot/python/python/dist/src/Python/Attic/newcompile.c,v retrieving revision 1.1.2.73 retrieving revision 1.1.2.74 diff -C2 -d -r1.1.2.73 -r1.1.2.74 *** newcompile.c 15 Feb 2004 04:19:28 -0000 1.1.2.73 --- newcompile.c 16 Feb 2004 04:07:24 -0000 1.1.2.74 *************** *** 2616,2620 **** { PySTEntryObject *ste = c->u->u_ste; ! int flags = 0; if (ste->ste_type != ModuleBlock) flags |= CO_NEWLOCALS; --- 2616,2620 ---- { PySTEntryObject *ste = c->u->u_ste; ! int flags = 0, n; if (ste->ste_type != ModuleBlock) flags |= CO_NEWLOCALS; *************** *** 2631,2634 **** --- 2631,2646 ---- if (ste->ste_varkeywords) flags |= CO_VARKEYWORDS; + n = PyDict_Size(c->u->u_freevars); + if (n < 0) + return -1; + if (n == 0) { + n = PyDict_Size(c->u->u_cellvars); + if (n < 0) + return -1; + if (n == 0) { + flags |= CO_NOFREE; + } + } + return flags; } *************** *** 2645,2649 **** PyObject *freevars = NULL; PyObject *cellvars = NULL; ! int nlocals; consts = dict_keys_inorder(c->u->u_consts, 0); --- 2657,2661 ---- PyObject *freevars = NULL; PyObject *cellvars = NULL; ! int nlocals, flags; consts = dict_keys_inorder(c->u->u_consts, 0); *************** *** 2662,2667 **** nlocals = PyDict_Size(c->u->u_varnames); co = PyCode_New(c->u->u_argcount, nlocals, stackdepth(c), ! compute_code_flags(c), a->a_bytecode, consts, names, varnames, freevars, cellvars, --- 2674,2682 ---- nlocals = PyDict_Size(c->u->u_varnames); + flags = compute_code_flags(c); + if (flags < 0) + goto error; co = PyCode_New(c->u->u_argcount, nlocals, stackdepth(c), ! flags, a->a_bytecode, consts, names, varnames, freevars, cellvars,

1 0