Optimize products of 1 element

This commit is contained in:
wborgeaud 2021-07-01 15:57:55 +02:00
parent 59410447bf
commit 1858a869a7

View File

@ -9,11 +9,17 @@ pub fn partial_products<T: Product + Copy>(v: &[T], max_degree: usize) -> Vec<T>
while remainder.len() >= max_degree {
let new_partials = remainder
.chunks(max_degree)
// TODO: If `chunk.len()=1`, there's some redundant data.
.filter(|chunk| chunk.len() != 1)
.map(|chunk| chunk.iter().copied().product())
.collect::<Vec<_>>();
res.extend_from_slice(&new_partials);
let addendum = if remainder.len() % max_degree == 1 {
vec![*remainder.last().unwrap()]
} else {
vec![]
};
remainder = new_partials;
remainder.extend(addendum);
}
res
@ -24,7 +30,8 @@ pub fn num_partial_products(n: usize, max_degree: usize) -> (usize, usize) {
let mut remainder = n;
while remainder >= max_degree {
let new_partials_len = ceil_div_usize(remainder, max_degree);
res += new_partials_len;
let addendum = if remainder % max_degree == 1 { 1 } else { 0 };
res += new_partials_len - addendum;
remainder = new_partials_len;
}
@ -42,10 +49,17 @@ pub fn check_partial_products<T: Product + Copy + Sub<Output = T>>(
while remainder.len() >= max_degree {
let products = remainder
.chunks(max_degree)
.filter(|chunk| chunk.len() != 1)
.map(|chunk| chunk.iter().copied().product())
.collect::<Vec<T>>();
res.extend(products.iter().zip(&partials).map(|(&a, &b)| a - b));
let addendum = if remainder.len() % max_degree == 1 {
vec![*remainder.last().unwrap()]
} else {
vec![]
};
remainder = partials.drain(..products.len()).collect();
remainder.extend(addendum)
}
res
@ -61,7 +75,7 @@ mod tests {
fn test_partial_products() {
let v = vec![1, 2, 3, 4, 5, 6];
let p = partial_products(&v, 2);
assert_eq!(p, vec![2, 12, 30, 24, 30, 720]);
assert_eq!(p, vec![2, 12, 30, 24, 720]);
assert_eq!(p.len(), num_partial_products(v.len(), 2).0);
assert!(check_partial_products(&v, &p, 2)
.iter()