Fixed unit test

This commit is contained in:
Barry Warsaw 1998-09-25 22:51:36 +00:00
parent 9195f55bbf
commit a5a018fbd4
1 changed files with 6 additions and 6 deletions

View File

@ -24,6 +24,7 @@ class BadColor(Exception):
DEFAULT_DB = None DEFAULT_DB = None
# generic class # generic class
class ColorDB: class ColorDB:
@ -169,7 +170,7 @@ def triplet_to_rrggbb(rgbtuple):
_maxtuple = (256.0,) * 3 _maxtuple = (256.0,) * 3
def triplet_to_pmwrgb(rgbtuple): def triplet_to_fractional_rgb(rgbtuple):
return map(operator.__div__, rgbtuple, _maxtuple) return map(operator.__div__, rgbtuple, _maxtuple)
@ -183,10 +184,9 @@ if __name__ == '__main__':
sys.exit(1) sys.exit(1)
# on my system, this color matches exactly # on my system, this color matches exactly
target = 'navy' target = 'navy'
target = 'snow' red, green, blue = rgbtuple = colordb.find_byname(target)
red, green, blue = colordb.find_byname(target) print target, ':', red, green, blue, triplet_to_rrggbb(rgbtuple)
print target, ':', red, green, blue, hex(rrggbb) name, aliases = colordb.find_byrgb(rgbtuple)
name, aliases = colordb.find_byrgb((red, green, blue))
print 'name:', name, 'aliases:', string.join(aliases, ", ") print 'name:', name, 'aliases:', string.join(aliases, ", ")
target = (1, 1, 128) # nearest to navy target = (1, 1, 128) # nearest to navy
target = (145, 238, 144) # nearest to lightgreen target = (145, 238, 144) # nearest to lightgreen
@ -194,7 +194,7 @@ if __name__ == '__main__':
print 'finding nearest to', target, '...' print 'finding nearest to', target, '...'
import time import time
t0 = time.time() t0 = time.time()
nearest = apply(colordb.nearest, target) nearest = colordb.nearest(target)
t1 = time.time() t1 = time.time()
print 'found nearest color', nearest, 'in', t1-t0, 'seconds' print 'found nearest color', nearest, 'in', t1-t0, 'seconds'