mirror of
https://github.com/KrisKennaway/ii-vision.git
synced 2024-06-18 03:29:31 +00:00
f3d03a1b87
make_edit_distance - use MASKED_DOTS since it does not have a simple relationship to the HEADER_BITS/BODY_BITS for HGR - try disabling transposition distances for Damerau-Levenshtein, this may give better quality screen - introduce separate notion of MASKED_DOTS which is the number of (coloured) pixels we can extract from MASKED_BITS. For HGR this is not the same. - fix bug in _fix_array_neighbours that was not fixing headers for HGR - don't cache everything in byte_pair_differences, it's effectively unbounded. Using 1M for LRU size seems to work just as well in practise, without leaking memory. - fix bug in _diff_weights when comparing content, we want to evaluate the effect of storing content byte in each offset separately, not cumulatively. - add a consistency check function (not currently wired up) to assert that headers/footers are in sync across columns - HGR should have 16 body bits, this was causing headers not to propagate correctly to/from neighbouring column - add test case for this bug video - Use 8 random bits consistently, using 16 in some places may have introduced bias - ignore palette bit when comparing 0x00 and 0x7f in sanity check
100 lines
3.3 KiB
Python
100 lines
3.3 KiB
Python
import sys
|
|
import unittest
|
|
|
|
import numpy as np
|
|
from etaprogress.progress import ProgressBar
|
|
|
|
import make_data_tables
|
|
import screen
|
|
from colours import HGRColours
|
|
from palette import PALETTES
|
|
|
|
|
|
class TestMakeDataTables(unittest.TestCase):
|
|
def test_pixel_string(self):
|
|
pixels = (HGRColours.BLACK, HGRColours.WHITE, HGRColours.ORANGE)
|
|
self.assertEqual("0FC", make_data_tables.pixel_string(pixels))
|
|
|
|
def test_edit_distances_dhgr(self):
|
|
"""Assert invariants and symmetries of the edit distance matrices."""
|
|
for p in PALETTES:
|
|
ed = screen.DHGRBitmap.edit_distances(p)
|
|
print(p)
|
|
|
|
bar = ProgressBar((4 * 2 ** 13 * (2 ** 13 - 1)) / 2, max_width=80)
|
|
|
|
cnt = 0
|
|
for ph in range(3):
|
|
|
|
# Only zero entries should be on diagonal, i.e. of form
|
|
# i << 13 + i
|
|
zeros = np.arange(len(ed[ph]))[ed[ph] == 0]
|
|
for z in zeros:
|
|
z1 = z & (2 ** 13 - 1)
|
|
z2 = (z >> 13) & (2 ** 13 - 1)
|
|
self.assertEqual(z1, z2)
|
|
|
|
# Assert that matrix is symmetrical
|
|
for i in range(2 ** 13):
|
|
for j in range(i):
|
|
cnt += 1
|
|
|
|
if cnt % 10000 == 0:
|
|
bar.numerator = cnt
|
|
print(bar, end='\r')
|
|
sys.stdout.flush()
|
|
|
|
self.assertEqual(
|
|
ed[ph][(i << 13) + j],
|
|
ed[ph][(j << 13) + i],
|
|
)
|
|
|
|
# Matrix is positive definite
|
|
self.assertGreaterEqual(ed[ph][(i << 13) + j], 0)
|
|
|
|
def test_edit_distances_hgr(self):
|
|
"""Assert invariants and symmetries of the edit distance matrices."""
|
|
|
|
for p in PALETTES:
|
|
ed = screen.HGRBitmap.edit_distances(p)
|
|
print(p)
|
|
|
|
bar = ProgressBar((4 * 2 ** 14 * (2 ** 14 - 1)) / 2, max_width=80)
|
|
|
|
cnt = 0
|
|
for ph in range(2):
|
|
|
|
# TODO: for HGR this invariant isn't true, all-0 and all-1
|
|
# values for header/footer/body with/without palette bit can
|
|
# also have zero difference
|
|
# # Only zero entries should be on diagonal, i.e. of form
|
|
# # i << 14 + i
|
|
# zeros = np.arange(len(ed[ph]))[ed[ph] == 0]
|
|
# for z in zeros:
|
|
# z1 = z & (2**14-1)
|
|
# z2 = (z >> 14) & (2**14-1)
|
|
# if z1 != z2:
|
|
# self.assertEqual(z1, z2)
|
|
|
|
# Assert that matrix is symmetrical
|
|
for i in range(2 ** 14):
|
|
for j in range(i):
|
|
cnt += 1
|
|
|
|
if cnt % 10000 == 0:
|
|
bar.numerator = cnt
|
|
print(bar, end='\r')
|
|
sys.stdout.flush()
|
|
|
|
self.assertEqual(
|
|
ed[ph][(i << 14) + j],
|
|
ed[ph][(j << 14) + i],
|
|
)
|
|
|
|
# Matrix is positive definite
|
|
self.assertGreaterEqual(ed[ph][(i << 14) + j], 0)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
unittest.main()
|