Compare commits
No commits in common. "f50db96697e2554082eb4f6b375ff6c608f1e965" and "5689cbd3d4187ac660f35e15ab4cb0cb9c5e696e" have entirely different histories.
f50db96697
...
5689cbd3d4
|
|
@ -13,7 +13,7 @@ pipeline {
|
||||||
sh '''
|
sh '''
|
||||||
. "$HOME/.cargo/env"
|
. "$HOME/.cargo/env"
|
||||||
cd plate-tool-web
|
cd plate-tool-web
|
||||||
trunk build --release --public-url "./"
|
trunk build --release --public-url "cool-stuff/$OUTPUT_DIR/"
|
||||||
'''
|
'''
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -131,8 +131,10 @@ impl TransferRegion {
|
||||||
pub fn calculate_map(&self) -> Box<dyn Fn(Well) -> Option<Vec<Well>> + '_> {
|
pub fn calculate_map(&self) -> Box<dyn Fn(Well) -> Option<Vec<Well>> + '_> {
|
||||||
// By validating first, we have a stronger guarantee that
|
// By validating first, we have a stronger guarantee that
|
||||||
// this function will not panic. :)
|
// this function will not panic. :)
|
||||||
|
// log::debug!("Validating: {:?}", self.validate());
|
||||||
if let Err(msg) = self.validate() {
|
if let Err(msg) = self.validate() {
|
||||||
log::error!("{}\nThis transfer will be empty.", msg);
|
eprintln!("{}", msg);
|
||||||
|
eprintln!("This transfer will be empty.");
|
||||||
return Box::new(|_| None);
|
return Box::new(|_| None);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -182,121 +184,74 @@ impl TransferRegion {
|
||||||
let Well { row: i, col: j } = w;
|
let Well { row: i, col: j } = w;
|
||||||
if source_wells.contains(&w) {
|
if source_wells.contains(&w) {
|
||||||
let possible_destination_wells = create_dense_rectangle(c1, c2);
|
let possible_destination_wells = create_dense_rectangle(c1, c2);
|
||||||
|
|
||||||
// Destination upper-left, bottom-right
|
|
||||||
let (d_ul, d_br) = standardize_rectangle(c1, c2);
|
let (d_ul, d_br) = standardize_rectangle(c1, c2);
|
||||||
|
|
||||||
// Source upper-left, bottom-right
|
|
||||||
let (s_ul, s_br) =
|
let (s_ul, s_br) =
|
||||||
standardize_rectangle(&source_corners.0, &source_corners.1);
|
standardize_rectangle(&source_corners.0, &source_corners.1);
|
||||||
|
|
||||||
// Get base size of source region before interleave
|
|
||||||
let s_dims = (
|
let s_dims = (
|
||||||
s_br.row.checked_sub(s_ul.row).unwrap() + 1,
|
s_br.row.checked_sub(s_ul.row).unwrap() + 1,
|
||||||
s_br.col.checked_sub(s_ul.col).unwrap() + 1,
|
s_br.col.checked_sub(s_ul.col).unwrap() + 1,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Get base size of destination region before interleave
|
|
||||||
let d_dims = (
|
let d_dims = (
|
||||||
d_br.row.checked_sub(d_ul.row).unwrap() + 1,
|
d_br.row.checked_sub(d_ul.row).unwrap() + 1,
|
||||||
d_br.col.checked_sub(d_ul.col).unwrap() + 1,
|
d_br.col.checked_sub(d_ul.col).unwrap() + 1,
|
||||||
);
|
);
|
||||||
|
|
||||||
// Precompute unsigned_abs: this should be cheap but
|
|
||||||
// this is called constantly in loops, plus prettier this way
|
|
||||||
let il_dest_uabs = (il_dest.0.unsigned_abs(), il_dest.1.unsigned_abs());
|
|
||||||
let il_source_uabs = (il_source.0.unsigned_abs(), il_source.1.unsigned_abs());
|
|
||||||
|
|
||||||
// Get the actual number of source wells in each dimension
|
|
||||||
// after considering interleave; essentially squish the air out of the
|
|
||||||
// region.
|
|
||||||
let number_used_src_wells = (
|
let number_used_src_wells = (
|
||||||
(s_dims.0 + il_source_uabs.0 - 1)
|
// Number of used source wells
|
||||||
.div_euclid(il_source_uabs.0),
|
(s_dims.0 + il_source.0.unsigned_abs() - 1)
|
||||||
(s_dims.1 + il_source_uabs.1 - 1)
|
.div_euclid(il_source.0.unsigned_abs()),
|
||||||
.div_euclid(il_source_uabs.1),
|
(s_dims.1 + il_source.1.unsigned_abs() - 1)
|
||||||
|
.div_euclid(il_source.1.unsigned_abs()),
|
||||||
);
|
);
|
||||||
|
let count = (
|
||||||
// How many times can we replicate in each direction?
|
// How many times can we replicate?
|
||||||
// Lazy solution: just increment the number of replicates until it wouldn't
|
|
||||||
// fit anymore!
|
|
||||||
let count = {
|
|
||||||
let replicate_base_size = (
|
|
||||||
number_used_src_wells.0 * il_dest_uabs.0,
|
|
||||||
number_used_src_wells.1 * il_dest_uabs.1,
|
|
||||||
);
|
|
||||||
(
|
|
||||||
if il_dest_uabs.0 == 0 {
|
|
||||||
1
|
|
||||||
} else {
|
|
||||||
(1..)
|
(1..)
|
||||||
.position(|n| {
|
.position(|n| {
|
||||||
(n * replicate_base_size.0)
|
n * number_used_src_wells.0 * il_dest.0.unsigned_abs()
|
||||||
.saturating_sub(il_dest_uabs.0)
|
- il_dest.0.unsigned_abs()
|
||||||
+ 1
|
+ 1
|
||||||
> d_dims.0
|
> d_dims.0
|
||||||
})
|
})
|
||||||
.unwrap() as u8
|
.unwrap() as u8,
|
||||||
},
|
|
||||||
if il_dest_uabs.1 == 0 {
|
|
||||||
1
|
|
||||||
} else {
|
|
||||||
(1..)
|
(1..)
|
||||||
.position(|n| {
|
.position(|n| {
|
||||||
(n * replicate_base_size.1)
|
n * number_used_src_wells.1 * il_dest.1.unsigned_abs()
|
||||||
.saturating_sub(il_dest_uabs.1)
|
- il_dest.1.unsigned_abs()
|
||||||
+ 1
|
+ 1
|
||||||
> d_dims.1
|
> d_dims.1
|
||||||
})
|
})
|
||||||
.unwrap() as u8
|
.unwrap() as u8,
|
||||||
},
|
);
|
||||||
)
|
|
||||||
};
|
|
||||||
// Normalize our i,j (source coords) to a dense rectangle consisting only
|
|
||||||
// of points actually in the transfer.
|
|
||||||
let i = i
|
let i = i
|
||||||
.saturating_sub(s_ul.row)
|
.saturating_sub(s_ul.row)
|
||||||
.saturating_div(il_source_uabs.0);
|
.saturating_div(il_source.0.unsigned_abs());
|
||||||
let j = j
|
let j = j
|
||||||
.saturating_sub(s_ul.col)
|
.saturating_sub(s_ul.col)
|
||||||
.saturating_div(il_source_uabs.1);
|
.saturating_div(il_source.1.unsigned_abs());
|
||||||
|
|
||||||
// Should not matter because of validation,
|
|
||||||
// but a cheap way to prevent div by 0
|
|
||||||
let checked_il_dest = (
|
|
||||||
u8::max(il_dest_uabs.0, 1u8),
|
|
||||||
u8::max(il_dest_uabs.1, 1u8),
|
|
||||||
);
|
|
||||||
// Precompute multiplication
|
|
||||||
let row_modulus = number_used_src_wells.0 * checked_il_dest.0;
|
|
||||||
let column_modulus = number_used_src_wells.1 * checked_il_dest.1;
|
|
||||||
let residue_class = (
|
|
||||||
(il_dest_uabs.0 * i) % row_modulus,
|
|
||||||
(il_dest_uabs.1 * j) % column_modulus
|
|
||||||
);
|
|
||||||
|
|
||||||
Some(
|
Some(
|
||||||
possible_destination_wells
|
possible_destination_wells
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.filter(|Well { row: x , ..}| {
|
.filter(|Well { row: x , ..}| {
|
||||||
x.checked_sub(d_ul.row).unwrap()
|
x.checked_sub(d_ul.row).unwrap()
|
||||||
% row_modulus // Counter along x
|
% (number_used_src_wells.0 * il_dest.0.unsigned_abs()) // Counter along x
|
||||||
== residue_class.0
|
== (il_dest.0.unsigned_abs() *i)
|
||||||
|
% (number_used_src_wells.0 * il_dest.0.unsigned_abs())
|
||||||
})
|
})
|
||||||
.filter(|Well { col: y, .. }| {
|
.filter(|Well { col: y, .. }| {
|
||||||
y.checked_sub(d_ul.col).unwrap()
|
y.checked_sub(d_ul.col).unwrap()
|
||||||
% column_modulus // Counter along u
|
% (number_used_src_wells.1 * il_dest.1.unsigned_abs()) // Counter along u
|
||||||
== residue_class.1
|
== (il_dest.1.unsigned_abs() *j)
|
||||||
|
% (number_used_src_wells.1 * il_dest.1.unsigned_abs())
|
||||||
})
|
})
|
||||||
.filter(|Well { row: x, col: y }| {
|
.filter(|Well { row: x, col: y }| {
|
||||||
// How many times have we replicated? < How many are we allowed
|
// How many times have we replicated? < How many are we allowed
|
||||||
// to replicate?
|
// to replicate?
|
||||||
x.checked_sub(d_ul.row).unwrap().div_euclid(row_modulus)
|
x.checked_sub(d_ul.row).unwrap().div_euclid(
|
||||||
< count.0
|
number_used_src_wells.0 * il_dest.0.unsigned_abs(),
|
||||||
&& y.checked_sub(d_ul.col)
|
) < count.0
|
||||||
.unwrap()
|
&& y.checked_sub(d_ul.col).unwrap().div_euclid(
|
||||||
.div_euclid(column_modulus)
|
number_used_src_wells.1 * il_dest.1.unsigned_abs(),
|
||||||
< count.1
|
) < count.1
|
||||||
})
|
})
|
||||||
.collect(),
|
.collect(),
|
||||||
)
|
)
|
||||||
|
|
@ -353,15 +308,11 @@ impl TransferRegion {
|
||||||
// log::debug!("s1.1: {}, max.1: {}", s1.1, source_max.1);
|
// log::debug!("s1.1: {}, max.1: {}", s1.1, source_max.1);
|
||||||
return Err("Source region is out-of-bounds! (Too wide)");
|
return Err("Source region is out-of-bounds! (Too wide)");
|
||||||
}
|
}
|
||||||
|
|
||||||
if il_dest == (0, 0) {
|
|
||||||
return Err("Refusing to pool both dimensions in a rectangular transfer!\nPlease select a point in the destination plate.");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
Region::Custom(_) => return Ok(()),
|
Region::Custom(_) => return Ok(()),
|
||||||
}
|
}
|
||||||
|
|
||||||
if il_source.0 == 0 || il_source.1 == 0 {
|
if il_source.0 == 0 || il_dest.1 == 0 {
|
||||||
return Err("Source interleave cannot be zero!");
|
return Err("Source interleave cannot be zero!");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -378,8 +329,7 @@ fn create_dense_rectangle(c1: &Well, c2: &Well) -> Vec<Well> {
|
||||||
// Creates a vector of every point between two corners
|
// Creates a vector of every point between two corners
|
||||||
let (c1, c2) = standardize_rectangle(c1, c2);
|
let (c1, c2) = standardize_rectangle(c1, c2);
|
||||||
|
|
||||||
let number_wells: usize = ((c2.row - c1.row + 1) as usize) * ((c2.col - c1.col + 1) as usize);
|
let mut points = Vec::<Well>::new();
|
||||||
let mut points = Vec::<Well>::with_capacity(number_wells);
|
|
||||||
for i in c1.row..=c2.row {
|
for i in c1.row..=c2.row {
|
||||||
for j in c1.col..=c2.col {
|
for j in c1.col..=c2.col {
|
||||||
points.push(Well { row: i, col: j });
|
points.push(Well { row: i, col: j });
|
||||||
|
|
@ -559,16 +509,12 @@ mod tests {
|
||||||
let transfer1_map = transfer1.calculate_map();
|
let transfer1_map = transfer1.calculate_map();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
transfer1_map(Well{ row: 1, col: 1}),
|
transfer1_map(Well{ row: 1, col: 1}),
|
||||||
Some(
|
Some(vec! {Well{ row: 2, col: 2}, Well{ row: 2, col: 8}, Well{ row: 8, col: 2}, Well{ row: 8, col: 8}}),
|
||||||
vec! {Well{ row: 2, col: 2}, Well{ row: 2, col: 8}, Well{ row: 8, col: 2}, Well{ row: 8, col: 8}}
|
|
||||||
),
|
|
||||||
"Failed type replicate 1"
|
"Failed type replicate 1"
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
transfer1_map(Well{ row: 2, col: 1}),
|
transfer1_map(Well{ row: 2, col: 1}),
|
||||||
Some(
|
Some(vec! {Well{ row: 5, col: 2}, Well{ row: 5, col: 8}, Well{ row: 11, col: 2}, Well{ row: 11, col: 8}}),
|
||||||
vec! {Well{ row: 5, col: 2}, Well{ row: 5, col: 8}, Well{ row: 11, col: 2}, Well{ row: 11, col: 8}}
|
|
||||||
),
|
|
||||||
"Failed type replicate 1"
|
"Failed type replicate 1"
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|
@ -584,14 +530,7 @@ mod tests {
|
||||||
let transfer2_dest = transfer2.get_destination_wells();
|
let transfer2_dest = transfer2.get_destination_wells();
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
transfer2_source,
|
transfer2_source,
|
||||||
vec![
|
vec![Well{ row: 1, col: 1}, Well{ row: 1, col: 2}, Well{ row: 1, col: 3}, Well{ row: 2, col: 1}, Well{ row: 2, col: 2}, Well{ row: 2, col: 3}],
|
||||||
Well { row: 1, col: 1 },
|
|
||||||
Well { row: 1, col: 2 },
|
|
||||||
Well { row: 1, col: 3 },
|
|
||||||
Well { row: 2, col: 1 },
|
|
||||||
Well { row: 2, col: 2 },
|
|
||||||
Well { row: 2, col: 3 }
|
|
||||||
],
|
|
||||||
"Failed type replicate 2 source"
|
"Failed type replicate 2 source"
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
|
|
@ -643,14 +582,7 @@ mod tests {
|
||||||
// Skipping source check---it's just 12 wells.
|
// Skipping source check---it's just 12 wells.
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
transfer1_dest,
|
transfer1_dest,
|
||||||
vec![
|
vec![Well{ row: 1, col: 9}, Well{ row: 1, col: 11}, Well{ row: 1, col: 13}, Well{ row: 1, col: 15}].into_iter().collect(),
|
||||||
Well { row: 1, col: 9 },
|
|
||||||
Well { row: 1, col: 11 },
|
|
||||||
Well { row: 1, col: 13 },
|
|
||||||
Well { row: 1, col: 15 }
|
|
||||||
]
|
|
||||||
.into_iter()
|
|
||||||
.collect(),
|
|
||||||
"Failed type pool 1 dest"
|
"Failed type pool 1 dest"
|
||||||
);
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue