Skip to content

⚡️ Speed up method LayoutDOM._check_min_preferred_max_height by 13% #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
codeflash-ai wants to merge 1 commit into
base: branch-3.9
Choose a base branch
from
Open

⚡️ Speed up method LayoutDOM._check_min_preferred_max_height by 13% #160

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions src/bokeh/models/layouts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
from __future__ import annotations

import logging # isort:skip
from bokeh.core.has_props import abstract
from bokeh.core.validation import error
from bokeh.core.validation.errors import MIN_PREFERRED_MAX_HEIGHT
from bokeh.models.ui.panes import Pane

log = logging.getLogger(__name__)

#-----------------------------------------------------------------------------
Expand Down Expand Up @@ -321,10 +326,19 @@ def _check_min_preferred_max_width(self):
@error(MIN_PREFERRED_MAX_HEIGHT)
def _check_min_preferred_max_height(self):
min_height = self.min_height if self.min_height is not None else 0
height = self.height if self.height is not None and (self.sizing_mode == "fixed" or self.height_policy == "fixed") else min_height
max_height = self.max_height if self.max_height is not None else height

if not (min_height <= height <= max_height):
# Inline both height and max_height calculation for less repeated lookups
height_val = self.height
height_set = height_val is not None and (
self.sizing_mode == "fixed" or self.height_policy == "fixed"
)
height = height_val if height_set else min_height

max_height_val = self.max_height
max_height = max_height_val if max_height_val is not None else height

# Combined check to minimize if/else and improve branch prediction
if min_height > height or height > max_height:
return str(self)

def _sphinx_height_hint(self) -> int|None:
Expand Down