yggdrasil/discrete_range_map
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed #7

Browse Source
This commit is contained in:
ripytide
2023-04-01 10:19:52 +01:00
parent 857436426f
commit 8dd61dab74
2 changed files with 429 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/range_bounds_map.rs
+221 -7
View File
@@ -1419,8 +1419,8 @@ where
value: V, value: V,
) -> Result<(), TryFromBoundsError> ) -> Result<(), TryFromBoundsError>
where where
V: Clone,
K: TryFromBounds<I>, K: TryFromBounds<I>,
V: Clone,
{ {
let _ = self.cut(&range_bounds)?; let _ = self.cut(&range_bounds)?;
self.insert_strict(range_bounds, value).unwrap(); self.insert_strict(range_bounds, value).unwrap();
@@ -1472,14 +1472,13 @@ where
self.iter().next_back() self.iter().next_back()
} }
/// Moves all elements from `other` into `self` by /// Moves all elements from `other` into `self` using
/// [`RangeBoundsMap::insert_strict()`] in ascending order, /// [`RangeBoundsMap::insert_strict()`] in ascending order,
/// leaving `other` empty. /// leaving `other` empty.
/// ///
/// If any of the `RangeBounds` in `other` overlap `self` then /// If the underlying [`RangeBoundsMap::insert_strict()`] returns
/// that `RangeBounds` is not inserted and the function returns. /// an `Err` at any point, then the element it failed on and all
/// This will mean all `RangeBounds` after the failed one will not /// those following are dropped, but not inserted into `self`.
/// be inserted into `self`.
/// ///
/// # Examples /// # Examples
/// ``` /// ```
@@ -1522,6 +1521,221 @@ where
return Ok(()); return Ok(());
} }
/// Moves all elements from `other` into `self` using
/// [`RangeBoundsMap::insert_merge_touching()`] in ascending order,
/// leaving `other` empty.
///
/// If the underlying [`RangeBoundsMap::insert_merge_touching()`] returns
/// an `Err` at any point, then the element it failed on and all
/// those following are dropped, but not inserted into `self`.
///
/// # Examples
/// ```
/// use range_bounds_map::RangeBoundsMap;
///
/// let mut base = RangeBoundsMap::from_slice_merge_touching([
/// (1..4, false),
/// (4..8, true),
/// ])
/// .unwrap();
///
/// let mut add = RangeBoundsMap::from_slice_merge_touching([
/// (10..38, true),
/// (40..42, false),
/// ])
/// .unwrap();
///
/// let expected = RangeBoundsMap::from_slice_merge_touching([
/// (1..4, false),
/// (4..8, true),
/// (10..38, true),
/// (40..42, false),
/// ])
/// .unwrap();
///
/// assert_eq!(base.append_merge_touching(&mut add), Ok(()));
/// assert_eq!(base, expected);
/// assert!(add.is_empty());
/// ```
#[trivial]
pub fn append_merge_touching(
&mut self,
other: &mut RangeBoundsMap<I, K, V>,
) -> Result<(), OverlapOrTryFromBoundsError>
where
K: TryFromBounds<I>,
{
for (range_bounds, value) in
other.remove_overlapping(&(Bound::Unbounded::<I>, Bound::Unbounded))
{
self.insert_merge_touching(range_bounds, value)?;
}
return Ok(());
}
/// Moves all elements from `other` into `self` using
/// [`RangeBoundsMap::insert_merge_overlapping()`] in ascending order,
/// leaving `other` empty.
///
/// If the underlying [`RangeBoundsMap::insert_merge_overlapping()`] returns
/// an `Err` at any point, then the element it failed on and all
/// those following are dropped, but not inserted into `self`.
///
/// # Examples
/// ```
/// use range_bounds_map::RangeBoundsMap;
///
/// let mut base = RangeBoundsMap::from_slice_merge_overlapping([
/// (1..4, false),
/// (4..8, true),
/// ])
/// .unwrap();
///
/// let mut add = RangeBoundsMap::from_slice_merge_overlapping([
/// (10..38, true),
/// (40..42, false),
/// ])
/// .unwrap();
///
/// let expected = RangeBoundsMap::from_slice_merge_overlapping([
/// (1..4, false),
/// (4..8, true),
/// (10..38, true),
/// (40..42, false),
/// ])
/// .unwrap();
///
/// assert_eq!(base.append_merge_overlapping(&mut add), Ok(()));
/// assert_eq!(base, expected);
/// assert!(add.is_empty());
/// ```
#[trivial]
pub fn append_merge_overlapping(
&mut self,
other: &mut RangeBoundsMap<I, K, V>,
) -> Result<(), TryFromBoundsError>
where
K: TryFromBounds<I>,
{
for (range_bounds, value) in
other.remove_overlapping(&(Bound::Unbounded::<I>, Bound::Unbounded))
{
self.insert_merge_overlapping(range_bounds, value)?;
}
return Ok(());
}
/// Moves all elements from `other` into `self` using
/// [`RangeBoundsMap::insert_merge_touching_or_overlapping()`] in ascending order,
/// leaving `other` empty.
///
/// If the underlying [`RangeBoundsMap::insert_merge_touching_or_overlapping()`] returns
/// an `Err` at any point, then the element it failed on and all
/// those following are dropped, but not inserted into `self`.
///
/// # Examples
/// ```
/// use range_bounds_map::RangeBoundsMap;
///
/// let mut base =
/// RangeBoundsMap::from_slice_merge_touching_or_overlapping([
/// (1..4, false),
/// (4..8, true),
/// ])
/// .unwrap();
///
/// let mut add =
/// RangeBoundsMap::from_slice_merge_touching_or_overlapping([
/// (10..38, true),
/// (40..42, false),
/// ])
/// .unwrap();
///
/// let expected =
/// RangeBoundsMap::from_slice_merge_touching_or_overlapping([
/// (1..4, false),
/// (4..8, true),
/// (10..38, true),
/// (40..42, false),
/// ])
/// .unwrap();
///
/// assert_eq!(
/// base.append_merge_touching_or_overlapping(&mut add),
/// Ok(())
/// );
/// assert_eq!(base, expected);
/// assert!(add.is_empty());
/// ```
#[trivial]
pub fn append_merge_touching_or_overlapping(
&mut self,
other: &mut RangeBoundsMap<I, K, V>,
) -> Result<(), TryFromBoundsError>
where
K: TryFromBounds<I>,
{
for (range_bounds, value) in
other.remove_overlapping(&(Bound::Unbounded::<I>, Bound::Unbounded))
{
self.insert_merge_touching_or_overlapping(range_bounds, value)?;
}
return Ok(());
}
/// Moves all elements from `other` into `self` using
/// [`RangeBoundsMap::insert_overwrite()`] in ascending order,
/// leaving `other` empty.
///
/// If the underlying [`RangeBoundsMap::insert_overwrite()`] returns
/// an `Err` at any point, then the element it failed on and all
/// those following are dropped, but not inserted into `self`.
///
/// # Examples
/// ```
/// use range_bounds_map::RangeBoundsMap;
///
/// let mut base = RangeBoundsMap::from_slice_overwrite([
/// (1..4, false),
/// (4..8, true),
/// ])
/// .unwrap();
///
/// let mut add = RangeBoundsMap::from_slice_overwrite([
/// (10..38, true),
/// (40..42, false),
/// ])
/// .unwrap();
///
/// let expected = RangeBoundsMap::from_slice_overwrite([
/// (1..4, false),
/// (4..8, true),
/// (10..38, true),
/// (40..42, false),
/// ])
/// .unwrap();
///
/// assert_eq!(base.append_overwrite(&mut add), Ok(()));
/// assert_eq!(base, expected);
/// assert!(add.is_empty());
/// ```
#[trivial]
pub fn append_overwrite(
&mut self,
other: &mut RangeBoundsMap<I, K, V>,
) -> Result<(), TryFromBoundsError>
where
K: TryFromBounds<I>,
V: Clone,
{
for (range_bounds, value) in
other.remove_overlapping(&(Bound::Unbounded::<I>, Bound::Unbounded))
{
self.insert_overwrite(range_bounds, value)?;
}
return Ok(());
}
/// Splits the map in two at the given `start_bound()`. Returns /// Splits the map in two at the given `start_bound()`. Returns
/// the full or partial `RangeBounds` after the split. /// the full or partial `RangeBounds` after the split.
@@ -1894,8 +2108,8 @@ where
slice: [(K, V); N], slice: [(K, V); N],
) -> Result<RangeBoundsMap<I, K, V>, TryFromBoundsError> ) -> Result<RangeBoundsMap<I, K, V>, TryFromBoundsError>
where where
V: Clone,
K: TryFromBounds<I>, K: TryFromBounds<I>,
V: Clone,
{ {
let mut map = RangeBoundsMap::new(); let mut map = RangeBoundsMap::new();
for (range_bounds, value) in slice { for (range_bounds, value) in slice {
src/range_bounds_set.rs
+208 -6
View File
@@ -812,14 +812,13 @@ where
self.map.last_entry().map(|(key, _)| key) self.map.last_entry().map(|(key, _)| key)
} }
/// Moves all elements from `other` into `self` by /// Moves all elements from `other` into `self` using
/// [`RangeBoundsSet::insert_strict()`] in acending order, /// [`RangeBoundsSet::insert_strict()`] in ascending order,
/// leaving `other` empty. /// leaving `other` empty.
/// ///
/// If any of the `RangeBounds` in `other` overlap `self` then /// If the underlying [`RangeBoundsMap::insert_strict()`] returns
/// that `RangeBounds` is not inserted and the function returns. /// an `Err` at any point, then the element it failed on and all
/// This will mean all `RangeBounds` after the failed one will not /// those following are dropped, but not inserted into `self`.
/// be inserted into `self`.
/// ///
/// # Examples /// # Examples
/// ``` /// ```
@@ -856,6 +855,209 @@ where
return Ok(()); return Ok(());
} }
/// Moves all elements from `other` into `self` using
/// [`RangeBoundsSet::insert_merge_touching()`] in ascending order,
/// leaving `other` empty.
///
/// If the underlying [`RangeBoundsMap::insert_merge_touching()`] returns
/// an `Err` at any point, then the element it failed on and all
/// those following are dropped, but not inserted into `self`.
///
/// # Examples
/// ```
/// use range_bounds_map::RangeBoundsSet;
///
/// let mut base =
/// RangeBoundsSet::from_slice_merge_touching([1..4, 4..8])
/// .unwrap();
///
/// let mut add =
/// RangeBoundsSet::from_slice_merge_touching([10..38, 40..42])
/// .unwrap();
///
/// let expected = RangeBoundsSet::from_slice_merge_touching([
/// 1..4,
/// 4..8,
/// 10..38,
/// 40..42,
/// ])
/// .unwrap();
///
/// assert_eq!(base.append_merge_touching(&mut add), Ok(()));
/// assert_eq!(base, expected);
/// assert!(add.is_empty());
/// ```
#[trivial]
pub fn append_merge_touching(
&mut self,
other: &mut RangeBoundsSet<I, K>,
) -> Result<(), OverlapOrTryFromBoundsError>
where
K: TryFromBounds<I>,
{
for range_bounds in
other.remove_overlapping(&(Bound::Unbounded::<I>, Bound::Unbounded))
{
self.insert_merge_touching(range_bounds)?;
}
return Ok(());
}
/// Moves all elements from `other` into `self` using
/// [`RangeBoundsSet::insert_merge_overlapping()`] in ascending order,
/// leaving `other` empty.
///
/// If the underlying [`RangeBoundsMap::insert_merge_overlapping()`] returns
/// an `Err` at any point, then the element it failed on and all
/// those following are dropped, but not inserted into `self`.
///
/// # Examples
/// ```
/// use range_bounds_map::RangeBoundsSet;
///
/// let mut base =
/// RangeBoundsSet::from_slice_merge_overlapping([1..4, 4..8])
/// .unwrap();
///
/// let mut add = RangeBoundsSet::from_slice_merge_overlapping([
/// 10..38,
/// 40..42,
/// ])
/// .unwrap();
///
/// let expected = RangeBoundsSet::from_slice_merge_overlapping([
/// 1..4,
/// 4..8,
/// 10..38,
/// 40..42,
/// ])
/// .unwrap();
///
/// assert_eq!(base.append_merge_overlapping(&mut add), Ok(()));
/// assert_eq!(base, expected);
/// assert!(add.is_empty());
/// ```
#[trivial]
pub fn append_merge_overlapping(
&mut self,
other: &mut RangeBoundsSet<I, K>,
) -> Result<(), TryFromBoundsError>
where
K: TryFromBounds<I>,
{
for range_bounds in
other.remove_overlapping(&(Bound::Unbounded::<I>, Bound::Unbounded))
{
self.insert_merge_overlapping(range_bounds)?;
}
return Ok(());
}
/// Moves all elements from `other` into `self` using
/// [`RangeBoundsSet::insert_merge_touching_or_overlapping()`] in ascending order,
/// leaving `other` empty.
///
/// If the underlying [`RangeBoundsMap::insert_merge_touching_or_overlapping()`] returns
/// an `Err` at any point, then the element it failed on and all
/// those following are dropped, but not inserted into `self`.
///
/// # Examples
/// ```
/// use range_bounds_map::RangeBoundsSet;
///
/// let mut base =
/// RangeBoundsSet::from_slice_merge_touching_or_overlapping([
/// 1..4,
/// 4..8,
/// ])
/// .unwrap();
///
/// let mut add =
/// RangeBoundsSet::from_slice_merge_touching_or_overlapping([
/// 10..38,
/// 40..42,
/// ])
/// .unwrap();
///
/// let expected =
/// RangeBoundsSet::from_slice_merge_touching_or_overlapping([
/// 1..4,
/// 4..8,
/// 10..38,
/// 40..42,
/// ])
/// .unwrap();
///
/// assert_eq!(
/// base.append_merge_touching_or_overlapping(&mut add),
/// Ok(())
/// );
/// assert_eq!(base, expected);
/// assert!(add.is_empty());
/// ```
#[trivial]
pub fn append_merge_touching_or_overlapping(
&mut self,
other: &mut RangeBoundsSet<I, K>,
) -> Result<(), TryFromBoundsError>
where
K: TryFromBounds<I>,
{
for range_bounds in
other.remove_overlapping(&(Bound::Unbounded::<I>, Bound::Unbounded))
{
self.insert_merge_touching_or_overlapping(range_bounds)?;
}
return Ok(());
}
/// Moves all elements from `other` into `self` using
/// [`RangeBoundsSet::insert_overwrite()`] in ascending order,
/// leaving `other` empty.
///
/// If the underlying [`RangeBoundsMap::insert_overwrite()`] returns
/// an `Err` at any point, then the element it failed on and all
/// those following are dropped, but not inserted into `self`.
///
/// # Examples
/// ```
/// use range_bounds_map::RangeBoundsSet;
///
/// let mut base =
/// RangeBoundsSet::from_slice_overwrite([1..4, 4..8]).unwrap();
///
/// let mut add =
/// RangeBoundsSet::from_slice_overwrite([10..38, 40..42])
/// .unwrap();
///
/// let expected = RangeBoundsSet::from_slice_overwrite([
/// 1..4,
/// 4..8,
/// 10..38,
/// 40..42,
/// ])
/// .unwrap();
///
/// assert_eq!(base.append_overwrite(&mut add), Ok(()));
/// assert_eq!(base, expected);
/// assert!(add.is_empty());
/// ```
#[trivial]
pub fn append_overwrite(
&mut self,
other: &mut RangeBoundsSet<I, K>,
) -> Result<(), TryFromBoundsError>
where
K: TryFromBounds<I>,
{
for range_bounds in
other.remove_overlapping(&(Bound::Unbounded::<I>, Bound::Unbounded))
{
self.insert_overwrite(range_bounds)?;
}
return Ok(());
}
/// Splits the set in two at the given `start_bound()`. Returns /// Splits the set in two at the given `start_bound()`. Returns
/// the full or partial `RangeBounds` after the split. /// the full or partial `RangeBounds` after the split.