holobench 1.2.4__py3-none-any.whl → 1.3.1__py3-none-any.whl

bencher/results/bench_result_base.py

@@ -12,6 +12,7 @@ from bencher.variables.results import OptDir
 from copy import deepcopy
 from bencher.results.optuna_result import OptunaResult
 from bencher.variables.results import ResultVar
+from bencher.results.float_formatter import FormatFloat
 import panel as pn
 
 
@@ -293,12 +294,19 @@ class BenchResultBase(OptunaResult):
 
             container_args = {"name": name, "styles": {"background": background_col}}
             outer_container = (
-                pn.Row(**container_args) if horizontal else pn.Column(**container_args, align="end")
+                pn.Row(**container_args) if horizontal else pn.Column(**container_args)
             )
 
+            max_len = 0
+
             for i in range(dataset.sizes[dim_sel]):
                 sliced = dataset.isel({dim_sel: i})
-                label = f"{dim_sel}={sliced.coords[dim_sel].values}"
+
+                lable_val = sliced.coords[dim_sel].values.item()
+                if isinstance(lable_val, (int, float)):
+                    lable_val = FormatFloat()(lable_val)
+
+                label = f"{dim_sel}={lable_val}"
 
                 panes = self._to_panes_da(
                     sliced,
@@ -321,12 +329,17 @@ class BenchResultBase(OptunaResult):
                     inner_container = pn.Row(**container_args)
                     align = ("end", "center")
 
-                side = pn.pane.Markdown(f"{label}", align=align)
+                label_len = len(label)
+                if label_len > max_len:
+                    max_len = label_len
+                side = pn.pane.Markdown(label, align=align)
 
                 inner_container.append(side)
                 inner_container.append(panes)
                 outer_container.append(inner_container)
                 # outer_container.append(pn.Row(inner_container, align="center"))
+            for c in outer_container:
+                c[0].width = max_len * 7
         else:
             return plot_callback(dataset=dataset, result_var=result_var, **kwargs)
 

bencher/results/float_formatter.py

@@ -0,0 +1,44 @@
+# from https://stackoverflow.com/questions/22989372/how-to-format-a-floating-number-to-maximum-fixed-width-in-python
+
+
+class FormatFloat:
+    def __init__(self, width=8):
+        self.width = width
+        self.maxnum = int("9" * (width - 1))  # 9999999
+        self.minnum = -int("9" * (width - 2))  # -999999
+
+    def __call__(self, x):
+        # for small numbers
+        # if -999,999 < given < 9,999,999:
+        if self.minnum < x < self.maxnum:
+            # o = f'{x:7}'
+            o = f"{x:{self.width - 1}}"
+
+            # converting int to float without adding zero
+            if "." not in o:
+                o += "."
+
+            # float longer than 8 will need rounding to fit width
+            elif len(o) > self.width:
+                # output = str(round(x, 7 - str(x).index(".")))
+                o = str(round(x, self.width - 1 - str(x).index(".")))
+                if len(o) < self.width:
+                    o += (self.width - len(o)) * "0"
+
+        else:
+            # for exponents
+            # added a loop for super large numbers or negative as "-" is another char
+            # Added max(max_char, 5) to account for max length of less
+            #     than 5, was having too much fun
+            # TODO can i come up with a threshold value for these up front,
+            #     so that i dont have to do this calc for every value??
+            for n in range(max(self.width, 5) - 5, 0, -1):
+                fill = f".{n}e"
+                o = f"{x:{fill}}".replace("+0", "+")
+
+                # if all good stop looping
+                if len(o) == self.width:
+                    break
+            else:
+                raise ValueError(f"Number is too large to fit in {self.width} characters", x)
+        return o

{holobench-1.2.4.dist-info → holobench-1.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: holobench
-Version: 1.2.4
+Version: 1.3.1
 Summary: A package for benchmarking the performance of arbitrary functions
 Author-email: Austin Gregg-Smith <blooop@gmail.com>
 Requires-Python: >=3.10
@@ -9,7 +9,8 @@ Requires-Dist: holoviews>=1.15,<=1.18.1
 Requires-Dist: numpy>=1.0,<=1.26.2
 Requires-Dist: param>=1.13.0,<=2.0.1
 Requires-Dist: hvplot>=0.8,<=0.9.1
-Requires-Dist: panel>=1.2.3,<1.4
+Requires-Dist: matplotlib>=3.6.3,<=3.8.2
+Requires-Dist: panel>=1.3.6,<=1.3.6
 Requires-Dist: diskcache>=5.6,<=5.6.3
 Requires-Dist: optuna>=3.2,<=3.5.0
 Requires-Dist: xarray>=2023.7,<=2023.12.0
@@ -17,7 +18,6 @@ Requires-Dist: plotly>=5.15,<=5.18.0
 Requires-Dist: sortedcontainers>=2.4,<=2.4
 Requires-Dist: pandas>=2.0,<=2.1.4
 Requires-Dist: strenum>=0.4.0,<=0.4.15
-Requires-Dist: seaborn>=0.12.1,<=0.13.0
 Requires-Dist: scikit-learn>=1.2,<=1.3.2
 Requires-Dist: str2bool>=1.1,<=1.1
 Requires-Dist: scoop>=0.7.0,<=0.7.2.0
@@ -25,7 +25,7 @@ Requires-Dist: ffmpeg-downloader>=0.3.0,<=0.3.0
 Requires-Dist: black>=23,<=23.12.1 ; extra == "test"
 Requires-Dist: pylint>=2.16,<=3.0.3 ; extra == "test"
 Requires-Dist: pytest-cov>=4.1,<=4.1 ; extra == "test"
-Requires-Dist: pytest>=7.4,<=7.4.3 ; extra == "test"
+Requires-Dist: pytest>=7.4,<=7.4.4 ; extra == "test"
 Requires-Dist: hypothesis>=6.82,<=6.92.2 ; extra == "test"
 Requires-Dist: ruff>=0.0.280,<=0.1.9 ; extra == "test"
 Requires-Dist: coverage>=7.2.7,<=7.4.0 ; extra == "test"

{holobench-1.2.4.dist-info → holobench-1.3.1.dist-info}/RECORD

@@ -57,7 +57,8 @@ bencher/plotting/plot_filter.py,sha256=Zff02hEcRffiqDEoXUHVZQJK5kW4HbMxe2GYCrxI8
 bencher/plotting/plt_cnt_cfg.py,sha256=BkiAsgHm35Mqb5OsjULGVK0Q6pGZ0WSsJxxwSOrbaQs,3124
 bencher/results/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bencher/results/bench_result.py,sha256=O0RxxUoudT43zukIKEmwaj8Q156UrEfwyj8NGFFwI0c,2797
-bencher/results/bench_result_base.py,sha256=SGln2bdnUUCrW3e4mdUHLyqejaako-A48Yfc1s0S1BA,13539
+bencher/results/bench_result_base.py,sha256=_TQk3WRORY6obm57ZhsDwk6Gbq-d8u_q69OgGKtS2sU,13960
+bencher/results/float_formatter.py,sha256=sX6HNCyaXdHDxC8ybVUHwCJ3qOKbPUkBOplVIHtKWjM,1746
 bencher/results/holoview_result.py,sha256=h-Q48m2dkHLPmvHnxmREpzt7MzQ-6iYLWrURDdLPjOw,21310
 bencher/results/optuna_result.py,sha256=704l1eFJUQGTmnTaj2pIJ9ocRehLgu4PwMYmJU2rY9w,12399
 bencher/results/panel_result.py,sha256=Fkp7eWt7lzmnM5R6MdEsBeyGg7CEJmlSEHWzNujcIUc,3479
@@ -67,6 +68,6 @@ bencher/variables/parametrised_sweep.py,sha256=q633o5zFY7P0ZeHX4G3AW3jYBfwoqLZZo
 bencher/variables/results.py,sha256=yXdLjfGPSerWhipw_GDZJpBB8KQgCqcdreb8WjIeah8,5119
 bencher/variables/sweep_base.py,sha256=I1LEeG1y5Jsw0a-Ik03t0tSzcfENht2GmBECJ3KNs28,6559
 bencher/variables/time.py,sha256=Le7s8_oUYJD4wCqwQw-a_FRDpYQOi8CqMbGYsBF07jg,2860
-holobench-1.2.4.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-holobench-1.2.4.dist-info/METADATA,sha256=wvb40_M92uqBLIgfNYWky5yqklmw69SnLDWtBtbJWFg,4952
-holobench-1.2.4.dist-info/RECORD,,
+holobench-1.3.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+holobench-1.3.1.dist-info/METADATA,sha256=vSgr3cL-IZvlxj-D9jz245_78Lj85EPycjjP7ceaALI,4956
+holobench-1.3.1.dist-info/RECORD,,