accidentally removed important function in utils

src/user_keypad.py

@@ -46,13 +46,11 @@ class UserKeypad:
         self.keypad = set_view.T.reshape(-1)
 
     def disperse_keypad(self):
-        # TODO: clean this up
         if not self.keypad_size.is_dispersable:
             raise ValueError("Keypad size is not dispersable")
-        rng = np.random.default_rng()
-        user_keypad_matrix = self.keypad_matrix()
-        shuffled_keys = rng.permutation(user_keypad_matrix, axis=0)
-        prop_rotation = rng.permutation(list(range(self.keypad_size.numb_of_keys)))[:self.keypad_size.props_per_key]
+        keypad_mat = self.keypad_matrix()
+        shuffled_keys = np.random.permutation(keypad_mat)
+        prop_rotation = np.random.choice(self.keypad_size.numb_of_keys, size=self.keypad_size.props_per_key, replace=False)
         dispersed_keypad = random_property_rotation(
             shuffled_keys,
             prop_rotation.tolist(),
@@ -61,14 +59,14 @@ class UserKeypad:
 
     def split_shuffle(self):
         # shuffle all keys
-        keypad_view = self.keypad_matrix()
-        np.random.shuffle(keypad_view)
+        keypad_mat = self.keypad_matrix()
+        np.random.shuffle(keypad_mat)
         # select half the property sets
         prop_permutation = np.random.permutation(self.keypad_size.props_per_key)[: self.keypad_size.props_per_key // 2]
         key_permutation = np.random.permutation(self.keypad_size.numb_of_keys)
         # shuffle the selected property sets to new keys as a group
-        keypad_view[:, prop_permutation] = keypad_view[key_permutation, :][:, prop_permutation]
-        self.keypad = keypad_view.reshape(-1)
+        keypad_mat[:, prop_permutation] = keypad_mat[key_permutation, :][:, prop_permutation]
+        self.keypad = keypad_mat.reshape(-1)
 
     def property_adjacency_graph(self) -> dict[int, set[int]]:
         user_keypad_keypad = self.keypad_matrix()

src/utils.py

@@ -0,0 +1,30 @@
+import numpy as np
+
+from src.models import KeypadSize
+
+
+def random_property_rotation(
+        user_keypad: np.ndarray,
+        prop_rotation: list[int]
+) -> np.ndarray:
+    transposed = user_keypad.T
+    if len(prop_rotation) != len(transposed):
+        raise ValueError("prop_rotation must be the same length as the number of properties")
+    for idx, prop_set in enumerate(transposed):
+        rotation = prop_rotation[idx]
+        rotation = rotation % len(prop_set) if len(prop_set) > 0 else 0
+        transposed[idx] = np.roll(prop_set, rotation)
+    return transposed.T
+
+
+def keypad_md_table(keypad_list: np.ndarray, keypad_size: KeypadSize) -> str:
+    assert (keypad_size.total_props == len(keypad_list))
+    keypad = keypad_list.reshape(-1, keypad_size.props_per_key)
+    table = "||" + "".join([f"position {idx}|" for idx in range(keypad_size.props_per_key)])
+    table += "\n|" + "".join("-|" for _ in range(keypad_size.props_per_key + 1))
+
+    for key in range(keypad_size.numb_of_keys):
+        table += f"\n|key {key}|"
+        table += "|".join([str(prop) for prop in keypad[key]])
+        table += "|"
+    return table