diff options
| author | Clifford Wolf <clifford@clifford.at> | 2015-09-27 10:54:19 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2015-09-27 10:54:19 +0200 |
| commit | a1103698328ada022b014bb7f8dbdb5d3e0bde1b (patch) | |
| tree | 8551711b26bd757251598af22f427a0c6e6c5a9e /icefuzz/database.py | |
| parent | c501c69942e3c19e11be0d061e56bb10a27d7a50 (diff) | |
| download | icestorm-a1103698328ada022b014bb7f8dbdb5d3e0bde1b.tar.gz icestorm-a1103698328ada022b014bb7f8dbdb5d3e0bde1b.tar.bz2 icestorm-a1103698328ada022b014bb7f8dbdb5d3e0bde1b.zip | |
Added 1k timings
Diffstat (limited to 'icefuzz/database.py')
| -rw-r--r-- | icefuzz/database.py | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/icefuzz/database.py b/icefuzz/database.py index 7720ce2..9f0ebc9 100644 --- a/icefuzz/database.py +++ b/icefuzz/database.py @@ -2,12 +2,9 @@ import re, sys, os -def cmp_bits(a, b): +def sort_bits_key(a): if a[0] == "!": a = a[1:] - if b[0] == "!": b = b[1:] - a = re.sub(r"\d+", lambda m: "%02d" % int(m.group(0)), a) - b = re.sub(r"\d+", lambda m: "%02d" % int(m.group(0)), b) - return cmp(a, b) + return re.sub(r"\d+", lambda m: "%02d" % int(m.group(0)), a) def read_database(filename, tile_type): raw_db = list() @@ -107,7 +104,7 @@ def read_database(filename, tile_type): database = list() for func in sorted(func_to_bits): bits = func_to_bits[func] - entry = (",".join(sorted(bits, cmp_bits)),) + func + entry = (",".join(sorted(bits, key=sort_bits_key)),) + func database.append(entry) return database |