emilia
/
plate-tool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for validating replicate divisibility

This commit is contained in:
Emilia Allison 2023-05-14 20:39:27 -04:00
parent 11a77fa276
commit 0b8b067e46
Signed by: emilia
GPG Key ID: 7A3F8997BFE894E0
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/data/transfer_region.rs
View File

@ -211,29 +211,25 @@ impl TransferRegion<'_> {
// complicated to compute the true dimensions of // complicated to compute the true dimensions of
// each region. // each region.
// (dim)*(il) - (il - 1) // (dim)*(il) - (il - 1)
let dest_diff_i = ((il_dest.0.abs() as u8) * u8::abs_diff(d1.0, d2.0)) let dest_dim_i = u8::abs_diff(d1.0, d2.0)+1;
.checked_sub(il_dest.0.abs() as u8 - 1) let dest_dim_j = u8::abs_diff(d1.1, d2.1)+1;
.expect("Dimension is somehow negative?") let source_dim_i = ((il_source.0.abs() as u8) * u8::abs_diff(s1.0, s2.0))
+ 1;
let dest_diff_j = ((il_dest.1.abs() as u8) * u8::abs_diff(d1.1, d2.1))
.checked_sub(il_dest.1.abs() as u8 - 1)
.expect("Dimension is somehow negative?")
+ 1;
let source_diff_i = ((il_source.0.abs() as u8) * u8::abs_diff(s1.0, s2.0))
.checked_sub(il_source.0.abs() as u8 - 1) .checked_sub(il_source.0.abs() as u8 - 1)
.expect("Dimension is somehow negative?") .expect("Dimension is somehow negative?")
+ 1; + 1;
let source_diff_j = ((il_source.1.abs() as u8) * u8::abs_diff(s1.1, s2.1)) let source_dim_j = ((il_source.1.abs() as u8) * u8::abs_diff(s1.1, s2.1))
.checked_sub(il_source.1.abs() as u8 - 1) .checked_sub(il_source.1.abs() as u8 - 1)
.expect("Dimension is somehow negative?") .expect("Dimension is somehow negative?")
+ 1; + 1;
if dest_diff_i % source_diff_i != 0 { if dest_dim_i % (source_dim_i+il_dest.0.abs() as u8) != 0 {
eprintln!("{} {}", source_diff_i, dest_diff_i); eprintln!("{} % {} = {}", dest_dim_i,
source_dim_i+il_dest.0.abs() as u8,
dest_dim_i % (source_dim_i+il_dest.0.abs() as u8));
return Err("Replicate region has indivisible height!"); return Err("Replicate region has indivisible height!");
} }
if dest_diff_j % source_diff_j != 0 { if dest_dim_j % (source_dim_j+il_dest.1.abs() as u8) != 0 {
eprintln!("{} {}", source_diff_j, source_diff_j); eprintln!("{} {}", source_dim_j, source_dim_j);
return Err("Replicate region has indivisible width!"); return Err("Replicate region has indivisible width!");
} }
} }
@ -344,7 +340,6 @@ mod tests {
let source = Plate::new(PlateType::Source, PlateFormat::W96); let source = Plate::new(PlateType::Source, PlateFormat::W96);
let destination = Plate::new(PlateType::Destination, PlateFormat::W384); let destination = Plate::new(PlateType::Destination, PlateFormat::W384);
let transfer1 = TransferRegion { let transfer1 = TransferRegion {
source_plate: &source, source_plate: &source,
source_region: Region::Rect((1, 1), (3, 3)), source_region: Region::Rect((1, 1), (3, 3)),