Skip to content

Even more typing #200

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
TheBB wants to merge 23 commits into
base: master
Choose a base branch
from
Open

Even more typing #200

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
533799d
Typing: volume_factory.py
TheBB Jan 2, 2026
6b0ca95
Typing: surface_factory.py
TheBB Jan 2, 2026
7c15846
Typing: svg.py
TheBB Jan 2, 2026
400bc28
More convenient type aliases
TheBB Jan 2, 2026
47d18f1
Typing: zero errors in the factory files
TheBB Jan 2, 2026
bdc7a33
Typing: utils/curve.py
TheBB Jan 3, 2026
ad5df7a
Typing: curve.py
TheBB Jan 3, 2026
333ed7a
Typing: splinemodel.py
TheBB Jan 3, 2026
f42a15d
Typing: ofoam.py
TheBB Jan 3, 2026
00041be
Typing: stl.py
TheBB Jan 4, 2026
cd94127
Remove bisect
TheBB Jan 4, 2026
951e608
Typing: io/master.py
TheBB Jan 4, 2026
e7e6b60
Typing: state.py
TheBB Jan 4, 2026
439c57c
Typing: utils/__init__.py
TheBB Jan 4, 2026
11a28fa
Lint and format
TheBB Jan 4, 2026
592cf9a
Add mypy to test pipeline
TheBB Jan 4, 2026
7667262
ofoam.py: fix lint-induced regression in
TheBB Jan 4, 2026
7ceb753
Ignore nutils, rhino when not installed
TheBB Jan 4, 2026
e87ea66
Clean up some type hints
TheBB Jan 4, 2026
3989e93
Remove unused typevars
TheBB Jan 5, 2026
2aa11d2
Remove dead code
TheBB Jan 5, 2026
a474759
Remove some unnecessary float casts
TheBB Jan 5, 2026
68e883c
Merge branch 'master' into more-more-typing
TheBB Jan 6, 2026
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
14 changes: 8 additions & 6 deletions src/splipy/basis.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
from .utils import ensure_listlike_old

if TYPE_CHECKING:
from .typing import ArrayLike, FloatArray, Scalar
from splipy.typing import Knots

from .typing import FloatArray, Scalar

__all__ = ["BSplineBasis"]

Expand All @@ -41,7 +43,7 @@ class BSplineBasis:
def __init__(
self,
order: int = 2,
knots: ArrayLike | None = None,
knots: Knots | None = None,
periodic: int = -1,
) -> None:
"""Construct a B-Spline basis with a given order and knot vector.
Expand Down Expand Up @@ -151,15 +153,15 @@ def greville(self, index: int | None = None) -> float | FloatArray:
@overload
def evaluate(
self,
t: ArrayLike | Scalar,
t: Knots | Scalar,
d: int = 0,
from_right: bool = ...,
) -> npt.NDArray[np.double]: ...

@overload
def evaluate(
self,
t: ArrayLike | Scalar,
t: Knots | Scalar,
Copy link
Copy Markdown
Member

@VikingScientist VikingScientist Jan 3, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is one of the places where I object to referring to parametric evaluation points t as knots. They simply are not knots and it is more misleading to call them as such.

d: int = 0,
from_right: bool = ...,
sparse: Literal[False] = ...,
Expand All @@ -168,15 +170,15 @@ def evaluate(
@overload
def evaluate(
self,
t: ArrayLike | Scalar,
t: Knots | Scalar,
d: int = 0,
from_right: bool = ...,
sparse: Literal[True] = ...,
) -> csr_matrix[np.float64]: ...

def evaluate(
self,
t: ArrayLike | Scalar,
t: Knots | Scalar,
d: int = 0,
from_right: bool = True,
sparse: bool = False,
Expand Down
4 changes: 2 additions & 2 deletions src/splipy/curve.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from .utils import ensure_listlike, is_singleton

if TYPE_CHECKING:
from collections.abc import Sequence
from collections.abc import Callable, Sequence

from .typing import ArrayLike, Direction, FloatArray, Scalar

Expand Down Expand Up @@ -494,7 +494,7 @@ def closest_point(self, pt: ArrayLike, t0: Scalar = None) -> tuple[FloatArray, f
break
return self(t), t

def error(self, target: Curve) -> tuple[FloatArray, float]:
def error(self, target: Curve | Callable[[FloatArray], FloatArray]) -> tuple[FloatArray, float]:
"""Computes the L2 (squared and per knot span) and max error between
this curve and a target curve

Expand Down
Loading