Commit: 77c204d9db398a5efe788d1372de67c20d6db6bf - GaloisField (hg)

A small kernel of code for playing with Galois fields of arbitrary characteristic

Commit MetaInfo

• Revision: 77c204d9db398a5efe788d1372de67c20d6db6bf (tree)
• Time: 2021-08-24 11:09:29
• Author: Eric Hopper <hopper@omni...>
• Commiter: Eric Hopper

Log Message

Color output support now more flexible via dependency injection.

Change Summary

• modified: numtheory_utils.py

Incremental Difference

diff -r 0e11b6b32650 -r 77c204d9db39 numtheory_utils.py
--- a/numtheory_utils.py	Sun Jul 18 15:56:59 2021 -0700
+++ b/numtheory_utils.py	Mon Aug 23 19:09:29 2021 -0700
@@ -1,10 +1,12 @@
-from typing import Any, Callable, TypeVar, Dict, Collection
+from typing import Any, Callable, TypeVar, Dict, Collection, Optional
 try:
     import colorama
     import blessings
     nocolors = False
+    TermType = blessings.Terminal
 except ModuleNotFoundError:
     nocolors = True
+    TermType = None
 
 __all__ = [
     'extended_gcd', 'print_group_table', 'mult_inverse', 'print_mult_inverses'
@@ -68,9 +70,10 @@
 def print_group_table(
         elements: Collection[T],
         op: Callable[[T, T], T],
-        highlight_map: Dict[T, int] = {}
+        highlight_map: Dict[T, int] = {},
+        term: Optional[TermType] = None
 ):
-    if not nocolors:
+    if (not nocolors) and (term is None):
         colorama.init()
         term = blessings.Terminal()
     width = max(len(str(x)) for x in elements)
@@ -78,7 +81,7 @@
     def element_str(a, width):
         s = f'{a:{width}}'
         spaces = ' ' * (len(s) - len(str(a)))
-        if (not nocolors) and (a in highlight_map):
+        if (term is not None) and (a in highlight_map):
             return spaces + term.color(highlight_map[a])(str(a))
         else:
             return s