dkelly/pynkode
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor asserts

Browse Source
This commit is contained in:
Donovan
2025-03-09 07:39:29 -05:00
parent 88b533c27b
commit 9fdf79842d
12 changed files with 84 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/user_interface.py
View File

@@ -9,9 +9,8 @@ class UserInterface(BaseModel):
interface: list[int]
keypad_size: KeypadSize
@staticmethod
def new(keypad_size: KeypadSize):
# Todo: this a hack do a proper random interface
@classmethod
def create(cls, keypad_size: KeypadSize) -> 'UserInterface':
interface = UserInterface(
interface=list(range(keypad_size.numb_of_attrs)),
keypad_size=keypad_size
@@ -20,7 +19,8 @@ class UserInterface(BaseModel):
return interface
def sign_up_interface(self):
assert (not self.keypad_size.is_dispersable)
if self.keypad_size.is_dispersable:
raise ValueError("Keypad size is dispersable")
self.random_interface_shuffle()
interface_matrix = self.interface_keypad_matrix()
attr_set_view = matrix_transpose(interface_matrix)
@@ -47,7 +47,8 @@ class UserInterface(BaseModel):
self.interface = matrix_to_list(keypad_view)
def disperse_interface(self):
assert (self.keypad_size.is_dispersable)
if not self.keypad_size.is_dispersable:
raise ValueError("Keypad size is not dispersable")
user_interface_matrix = list_to_matrix(self.interface, self.keypad_size.attrs_per_key)
shuffled_keys = secure_fisher_yates_shuffle(user_interface_matrix)
@@ -60,6 +61,7 @@ class UserInterface(BaseModel):
self.interface = matrix_to_list(dispersed_interface)
def partial_interface_shuffle(self):
# TODO: this should be split shuffle
numb_of_selected_sets = self.keypad_size.attrs_per_key // 2
# randomly shuffle half the sets. if attrs_per_key is odd, randomly add one 50% of the time
numb_of_selected_sets += choice([0, 1]) if (self.keypad_size.attrs_per_key & 1) == 1 else 0
@@ -80,7 +82,8 @@ class UserInterface(BaseModel):
attr_rotation: list[int]
) -> list[list[int]]:
transposed_user_interface = matrix_transpose(user_interface)
assert (len(attr_rotation) == len(transposed_user_interface))
if len(attr_rotation) != len(transposed_user_interface):
raise ValueError("attr_rotation must be the same length as the transposed user interface")
for idx, attr_set in enumerate(transposed_user_interface):
rotation = attr_rotation[idx]
transposed_user_interface[idx] = attr_set[rotation:] + attr_set[:rotation]
@@ -93,12 +96,12 @@ class UserInterface(BaseModel):
for attr in key:
graph[attr] = set(key)
graph[attr].remove(attr)
return graph
def get_attr_idx_by_keynumb_setidx(self, key_numb: int, set_idx: int) -> int:
assert (0 <= key_numb < self.keypad_size.numb_of_keys)
assert (0 <= set_idx < self.keypad_size.attrs_per_key)
if not (0 <= key_numb < self.keypad_size.numb_of_keys):
raise ValueError(f"key_numb must be between 0 and {self.keypad_size.numb_of_keys - 1}")
if not (0 <= set_idx < self.keypad_size.attrs_per_key):
raise ValueError(f"set_idx must be between 0 and {self.keypad_size.attrs_per_key - 1}")
keypad_attr_idx = self.interface_keypad_matrix()
return keypad_attr_idx[key_numb][set_idx]