Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ format:
isort tests
black src
black tests
flake8 src
flake8 src --max-complexity 12
pylint src

html:
Expand Down
1 change: 0 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ packages = [{ include = "shapepy", from = "src" }]

[tool.poetry.dependencies]
numpy = "^1.0.0"
rbool = "^0.0.4"
matplotlib = "^3.4.0"
pynurbs = "^1.0.7"
python = "^3.9"
Expand Down
4 changes: 2 additions & 2 deletions src/shapepy/analytic/polynomial.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from typing import Iterable, List, Union

from ..loggers import debug
from ..rbool import scale, shift
from ..rbool import move, scale
from ..scalar.reals import Math
from ..tools import Is, To, vectorize
from .base import BaseAnalytic, IAnalytic
Expand Down Expand Up @@ -176,7 +176,7 @@ def shift(self, amount: Real) -> Polynomial:
if (i + j) % 2:
value *= -1
newcoefs[j] += coef * value
return Polynomial(newcoefs, shift(self.domain, amount))
return Polynomial(newcoefs, move(self.domain, amount))

@debug("shapepy.analytic.polynomial")
def integrate(self, times: int = 1) -> Polynomial:
Expand Down
60 changes: 0 additions & 60 deletions src/shapepy/rbool.py

This file was deleted.

26 changes: 26 additions & 0 deletions src/shapepy/rbool/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
"""
Init file that includes the most used classes and functions of the module
"""

from .base import EmptyR1, Future, SubSetR1, WholeR1
from .bool1d import contains, extract_knots, intersect, invert, unite
from .converter import from_any
from .singles import DisjointR1, IntervalR1, SingleR1, bigger, lower
from .tools import (
create_interval,
create_single,
infimum,
maximum,
minimum,
subset_length,
supremum,
)
from .transform import move, scale

Future.convert = from_any
Future.unite = unite
Future.intersect = intersect
Future.invert = invert
Future.contains = contains
Future.scale = scale
Future.move = move
Loading