Fix float dimensions bug on some nested submatrices

alugowski · Sep 12, 2023 · 6fb716e · 6fb716e
1 parent 8492d98
commit 6fb716e
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 5 deletions.
diff --git a/doc/images/html-4d.png b/doc/images/html-4d.png
diff --git a/doc/images/html-adjacency.png b/doc/images/html-adjacency.png
diff --git a/doc/images/html-cities.png b/doc/images/html-cities.png
diff --git a/doc/images/latex-edgecases.png b/doc/images/latex-edgecases.png
diff --git a/matrepr/adapters/numpy_impl.py b/matrepr/adapters/numpy_impl.py
@@ -12,6 +12,8 @@ def __init__(self, mat):
         super().__init__()
         self.mat = mat
         self.is_vec = len(mat.shape) < 2
+        if self.is_vec:
+            self.row_labels = False
 
     def get_shape(self) -> tuple:
         # present at most 2D, higher dimensions will be handled as nested arrays

diff --git a/matrepr/html_formatter.py b/matrepr/html_formatter.py
@@ -82,8 +82,8 @@ def pprint(self, obj, current_indent=0, is_index=False):
             from copy import copy
             fmt = copy(self)
             fmt.lines = []
-            fmt.max_rows = max(self.max_rows / 2, 2)
-            fmt.max_cols = max(self.max_cols / 2, 2)
+            fmt.max_rows = max(self.max_rows // 2, 2)
+            fmt.max_cols = max(self.max_cols // 2, 2)
             fmt.num_after_dots = 0
             fmt.title = None
             fmt.indices = False

diff --git a/matrepr/latex_formatter.py b/matrepr/latex_formatter.py
@@ -116,8 +116,8 @@ def pprint(self, obj, is_index=False):
         from . import _get_adapter
         adapter = _get_adapter(obj, None, unsupported_raise=False)
         if adapter:
-            fmt = LatexFormatter(max_rows=max(self.max_rows / 2, 2),
-                                 max_cols=max(self.max_cols / 2, 2),
+            fmt = LatexFormatter(max_rows=max(self.max_rows // 2, 2),
+                                 max_cols=max(self.max_cols // 2, 2),
                                  num_after_dots=0, title_latex=None,
                                  fill_value=self.fill_value,
                                  latex_matrix_env=self.latex_matrix_env,

diff --git a/matrepr/string_formatter.py b/matrepr/string_formatter.py
@@ -255,7 +255,7 @@ def to_tabulate(mat: Any, **kwargs) -> str:
     adapter = _get_adapter(mat, options)
 
     if options.width_str:
-        txt_max_cols = max(1, int(options.width_str / 3))  # minimum 3 chars per column (if empty)
+        txt_max_cols = max(1, options.width_str // 3)  # minimum 3 chars per column (if empty)
         cols = min(options.max_cols, txt_max_cols)
         trunc = to_trunc(adapter, options.max_rows, cols, options.num_after_dots)
 

diff --git a/tests/test_numpy.py b/tests/test_numpy.py
@@ -21,6 +21,7 @@ def setUp(self):
                 [[1, 2], [3, 4]],
                 [[100, 200], [300, 400]],
             ]),
+            np.random.randint(low=0, high=10_000, size=(3, 5, 10)),  # 3D
             np.random.randint(low=0, high=10_000, size=(2, 2, 2, 2))  # 4D
         ]