Changeset 285 for trunk

Show
Ignore:
Timestamp:
04/27/09 22:36:36 (3 years ago)
Author:
ocjhb
Message:

even better

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/sandbox/jhb/oc2/coinsplitting.py

    r284 r285  
    1313            tokens.append(1) 
    1414            i +=1 
    15         elif d <= rest-d + denominations[i-1]: 
     15        elif d <= rest-d + denominations[i-1]+1: 
    1616            #print 'append %s' % d 
    1717            tokens.append(d) 
    1818            i +=1 
    19         elif d > rest -d + denominations[i-1]: 
     19        elif d > rest -d + denominations[i-1]+1: 
    2020            i -= 1 
    2121    return tokens             
    … …  
    3131    return picked             
    3232 
    33 dl = [[1,2,5,10],[1,3,9,27],[1,3,5,7,11,13,17,19,23],[1,17,33]]    
     33dl = [[1,2,5,10,20,50,100],[1,3,9,27],[1,3,5,7,11,13,17,19,23],[1,17,33]] 
     34dl = dl[0:1] 
    3435problems = 0 
    3536for denominations in dl: 
    3637    print 'DENOMINATIONS %s' % denominations 
    3738    print 
    38     for i in range(1,max(denominations)*10): 
     39    for i in range(1,max(denominations)*2): 
    3940        print 'Tokenize %i, ' % i, 
    4041        tokens = tokenizer(denominations,i)