Added new test "3sort". This is sorted data but with 3 random exchanges.
It's a little better than average for our sort.
This commit is contained in:
parent
1cfcafceb6
commit
0a30e648e0
|
@ -74,12 +74,13 @@ def tabulate(r):
|
||||||
*sort: random data
|
*sort: random data
|
||||||
\sort: descending data
|
\sort: descending data
|
||||||
/sort: ascending data
|
/sort: ascending data
|
||||||
|
3sort: ascending data but with 3 random exchanges
|
||||||
~sort: many duplicates
|
~sort: many duplicates
|
||||||
=sort: all equal
|
=sort: all equal
|
||||||
!sort: worst case scenario
|
!sort: worst case scenario
|
||||||
|
|
||||||
"""
|
"""
|
||||||
cases = ("*sort", "\\sort", "/sort", "~sort", "=sort", "!sort")
|
cases = ("*sort", "\\sort", "/sort", "3sort", "~sort", "=sort", "!sort")
|
||||||
fmt = ("%2s %7s" + " %6s"*len(cases))
|
fmt = ("%2s %7s" + " %6s"*len(cases))
|
||||||
print fmt % (("i", "2**i") + cases)
|
print fmt % (("i", "2**i") + cases)
|
||||||
for i in r:
|
for i in r:
|
||||||
|
@ -92,6 +93,13 @@ def tabulate(r):
|
||||||
doit(L) # \sort
|
doit(L) # \sort
|
||||||
doit(L) # /sort
|
doit(L) # /sort
|
||||||
|
|
||||||
|
# Do 3 random exchanges.
|
||||||
|
for dummy in range(3):
|
||||||
|
i1 = random.randrange(n)
|
||||||
|
i2 = random.randrange(n)
|
||||||
|
L[i1], L[i2] = L[i2], L[i1]
|
||||||
|
doit(L) # 3sort
|
||||||
|
|
||||||
# Arrange for lots of duplicates.
|
# Arrange for lots of duplicates.
|
||||||
if n > 4:
|
if n > 4:
|
||||||
del L[4:]
|
del L[4:]
|
||||||
|
|
Loading…
Reference in New Issue