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
56 changes: 35 additions & 21 deletions lib_tsalign/src/a_star_aligner/alignment_geometry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -52,41 +52,55 @@ impl AlignmentRange {
self.offset.query..self.limit.query
}

pub fn move_offsets_left(&self) -> Self {
Self::new_offset_limit(
#[must_use]
pub fn move_offsets_left(&self) -> Option<Self> {
Some(Self::new_offset_limit(
AlignmentCoordinates::new(
self.offset.reference.checked_sub(1).unwrap(),
self.offset.query.checked_sub(1).unwrap(),
self.offset.reference.checked_sub(1)?,
self.offset.query.checked_sub(1)?,
),
self.limit,
)
))
}

pub fn move_offsets_right(&self) -> Self {
assert!(self.offset.reference < self.limit.reference);
assert!(self.offset.query < self.limit.query);
#[must_use]
pub fn move_offsets_right(&self) -> Option<Self> {
let new_ref_offset = self.offset.reference.checked_add(1)?;
let new_qry_offset = self.offset.query.checked_add(1)?;

if new_ref_offset > self.limit.reference || new_qry_offset > self.limit.query {
return None;
}

Self::new_offset_limit(
AlignmentCoordinates::new(self.offset.reference + 1, self.offset.query + 1),
Some(Self::new_offset_limit(
AlignmentCoordinates::new(new_ref_offset, new_qry_offset),
self.limit,
)
))
}

pub fn move_limits_left(&self) -> Self {
assert!(self.offset.reference < self.limit.reference);
assert!(self.offset.query < self.limit.query);
#[must_use]
pub fn move_limits_left(&self) -> Option<Self> {
let new_ref_limit = self.limit.reference.checked_sub(1)?;
let new_qry_limit = self.limit.query.checked_sub(1)?;

Self::new_offset_limit(
if new_ref_limit < self.offset.reference || new_qry_limit > self.offset.query {
return None;
}
Some(Self::new_offset_limit(
self.offset,
AlignmentCoordinates::new(self.limit.reference - 1, self.limit.query - 1),
)
AlignmentCoordinates::new(new_ref_limit, new_qry_limit),
))
}

pub fn move_limits_right(&self) -> Self {
Self::new_offset_limit(
#[must_use]
pub fn move_limits_right(&self) -> Option<Self> {
Some(Self::new_offset_limit(
self.offset,
AlignmentCoordinates::new(self.limit.reference + 1, self.limit.query + 1),
)
AlignmentCoordinates::new(
self.limit.reference.checked_add(1)?,
self.limit.query.checked_add(1)?,
),
))
}
}

Expand Down
Loading
Loading