From ff9027f47342b3940083496f0c5bc63c7e83fe43 Mon Sep 17 00:00:00 2001 From: Stefan Mesken Date: Mon, 8 Apr 2019 23:10:27 +0200 Subject: [PATCH] removed depedency on Vec --- src/base/edition.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/base/edition.rs b/src/base/edition.rs index 1c51479f..e473246f 100644 --- a/src/base/edition.rs +++ b/src/base/edition.rs @@ -315,12 +315,11 @@ impl> Matrix { DefaultAllocator: Reallocator, { let mut m = self.into_owned(); - let mut v: Vec = indices.to_vec(); let (nrows, ncols) = m.data.shape(); let mut offset: usize = 0; let mut target: usize = 0; while offset + target < ncols.value() { - if v.contains(&(target + offset)) { + if indices.contains(&(target + offset)) { offset += 1; } else { unsafe { @@ -339,26 +338,25 @@ impl> Matrix { unsafe { Matrix::from_data(DefaultAllocator::reallocate_copy( nrows, - ncols.sub(Dynamic::from_usize(v.len())), + ncols.sub(Dynamic::from_usize(offset)), m.data, )) } } - /// Removes all columns in `indices` + /// Removes all rows in `indices` #[cfg(any(feature = "std", feature = "alloc"))] pub fn remove_rows_at(self, indices: &[usize]) -> MatrixMN where R: DimSub, DefaultAllocator: Reallocator, - { + { let mut m = self.into_owned(); - let mut v: Vec = indices.to_vec(); let (nrows, ncols) = m.data.shape(); let mut offset: usize = 0; let mut target: usize = 0; while offset + target < nrows.value() * ncols.value() { - if v.contains(&((target + offset) % nrows.value())) { + if indices.contains(&((target + offset) % nrows.value())) { offset += 1; } else { unsafe { @@ -373,7 +371,7 @@ impl> Matrix { unsafe { Matrix::from_data(DefaultAllocator::reallocate_copy( - nrows.sub(Dynamic::from_usize(v.len())), + nrows.sub(Dynamic::from_usize(offset / ncols.value ())), ncols, m.data, ))