Skip to content

Commit

Permalink
Merge branch 'master' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
venaturum committed Oct 14, 2021
2 parents 9025932 + 0b2edde commit 59c9190
Show file tree
Hide file tree
Showing 16 changed files with 940 additions and 84 deletions.
5 changes: 4 additions & 1 deletion docs/reference/accessors.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ Accessors
ArrayAccessor.union
ArrayAccessor.intersection
ArrayAccessor.difference
ArrayAccessor.symmetric_difference
ArrayAccessor.symmetric_difference
ArrayAccessor.isdisjoint
ArrayAccessor.issuperset
ArrayAccessor.issubset
4 changes: 3 additions & 1 deletion docs/reference/interval.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ Interval
union
intersection
difference
symmetric_difference
symmetric_difference
issuperset
issubset
5 changes: 4 additions & 1 deletion docs/reference/package.rst
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,7 @@ Top level functions
union
intersection
difference
symmetric_difference
symmetric_difference
isdisjoint
issuperset
issubset
23 changes: 23 additions & 0 deletions docs/release_notes/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,24 @@
Release notes
========================


ADD UNRELEASED CHANGES ABOVE THIS LINE


**v0.2.0 2021-10-15**

Added the following methods

- :meth:`piso.isdisjoint`
- :meth:`piso.issuperset`
- :meth:`piso.issubset`
- :meth:`ArrayAccessor.isdisjoint() <piso.accessor.ArrayAccessor.isdisjoint>`
- :meth:`ArrayAccessor.issuperset() <piso.accessor.ArrayAccessor.issuperset>`
- :meth:`ArrayAccessor.issubset() <piso.accessor.ArrayAccessor.issubset>`
- :meth:`piso.interval.issuperset`
- :meth:`piso.interval.issubset`


**v0.1.0 2021-10-10**

The following methods are included in the initial release of `piso`
Expand All @@ -13,7 +31,12 @@ The following methods are included in the initial release of `piso`
- :meth:`piso.intersection`
- :meth:`piso.difference`
- :meth:`piso.symmetric_difference`
- :meth:`ArrayAccessor.union() <piso.accessor.ArrayAccessor.union>`
- :meth:`ArrayAccessor.intersection() <piso.accessor.ArrayAccessor.intersection>`
- :meth:`ArrayAccessor.difference() <piso.accessor.ArrayAccessor.difference>`
- :meth:`ArrayAccessor.symmetric_difference() <piso.accessor.ArrayAccessor.symmetric_difference>`
- :meth:`piso.interval.union`
- :meth:`piso.interval.intersection`
- :meth:`piso.interval.difference`
- :meth:`piso.interval.symmetric_difference`

10 changes: 9 additions & 1 deletion piso/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
from piso.intervalarray import difference, intersection, symmetric_difference, union
from piso.intervalarray import (
difference,
intersection,
isdisjoint,
issubset,
issuperset,
symmetric_difference,
union,
)


def register_accessors():
Expand Down
23 changes: 23 additions & 0 deletions piso/accessor.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,29 @@ def symmetric_difference(
return_type=return_type,
)

@Appender(docstrings.isdisjoint_docstring, join="\n", indents=1)
def isdisjoint(self, *interval_arrays):
return intervalarray.isdisjoint(
self._interval_array,
*interval_arrays,
)

@Appender(docstrings.issuperset_docstring, join="\n", indents=1)
def issuperset(self, *interval_arrays, squeeze=False):
return intervalarray.issuperset(
self._interval_array,
*interval_arrays,
squeeze=squeeze,
)

@Appender(docstrings.issubset_docstring, join="\n", indents=1)
def issubset(self, *interval_arrays, squeeze=False):
return intervalarray.issubset(
self._interval_array,
*interval_arrays,
squeeze=squeeze,
)


def _register_accessors():
_register_accessor("piso", pd.IntervalIndex)(ArrayAccessor)
Expand Down
Loading

0 comments on commit 59c9190

Please sign in to comment.