djkato/grid
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf: improve remove_col speed

Browse source
This commit is contained in:
Armin Becher 2023-04-30 23:10:09 +02:00
parent bd049b28c4
commit 2b72b9f9f3
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/lib.rs
View file

@ -40,6 +40,7 @@ extern crate alloc;
#[cfg(all(not(feature = "std")))] #[cfg(all(not(feature = "std")))]
use alloc::{vec::Vec, vec, format}; use alloc::{vec::Vec, vec, format};
use core::cmp;
use core::cmp::Eq; use core::cmp::Eq;
use core::fmt; use core::fmt;
use core::iter::StepBy; use core::iter::StepBy;
@ -575,6 +576,9 @@ impl<T> Grid<T> {
.drain((row_index * self.cols)..((row_index + 1) * self.cols)); .drain((row_index * self.cols)..((row_index + 1) * self.cols));
self.rows -= 1; self.rows -= 1;
if self.rows == 0 {
self.cols = 0;
}
Some(residue.collect()) Some(residue.collect())
} }
@ -624,12 +628,17 @@ impl<T> Grid<T> {
if self.cols == 0 || self.rows == 0 || col_index >= self.cols { if self.cols == 0 || self.rows == 0 || col_index >= self.cols {
return None; return None;
} }
let mut residue: Vec<T> = vec![];
for i in 0..self.rows { for i in 0..self.rows {
residue.push(self.data.remove(i * self.cols + col_index - i)); let row_idx = col_index + i * (self.cols - 1);
let end = cmp::min(row_idx+self.cols+i, self.data.len());
self.data[row_idx..end].rotate_left(i + 1);
} }
self.cols -= 1; let col = self.data.split_off(self.data.len() - self.rows);
Some(residue) self.cols -= 1;
if self.cols == 0 {
self.rows = 0;
}
Some(col)
} }
/// Insert a new row at the index and shifts all rows after down. /// Insert a new row at the index and shifts all rows after down.