work/smartcore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix clippy errors after --all-features was enabled

Browse Source
This commit is contained in:
Luis Moreno
2020-11-10 21:10:21 -04:00
parent 126b306681
commit 85d2ecd1c9
3 changed files with 29 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/linalg/nalgebra_bindings.rs
+11 -15
View File
@@ -64,7 +64,7 @@ impl<T: RealNumber + 'static> BaseVector<T> for MatrixMN<T, U1, Dynamic> {
} }
fn to_vec(&self) -> Vec<T> { fn to_vec(&self) -> Vec<T> {
self.row(0).iter().map(|v| *v).collect() self.row(0).iter().copied().collect()
} }
fn zeros(len: usize) -> Self { fn zeros(len: usize) -> Self {
@@ -112,7 +112,7 @@ impl<T: RealNumber + 'static> BaseVector<T> for MatrixMN<T, U1, Dynamic> {
let mut norm = T::zero(); let mut norm = T::zero();
for xi in self.iter() { for xi in self.iter() {
norm = norm + xi.abs().powf(p); norm += xi.abs().powf(p);
} }
norm.powf(T::one() / p) norm.powf(T::one() / p)
@@ -174,7 +174,7 @@ impl<T: RealNumber + 'static> BaseVector<T> for MatrixMN<T, U1, Dynamic> {
} }
fn unique(&self) -> Vec<T> { fn unique(&self) -> Vec<T> {
let mut result: Vec<T> = self.iter().map(|v| *v).collect(); let mut result: Vec<T> = self.iter().copied().collect();
result.sort_by(|a, b| a.partial_cmp(b).unwrap()); result.sort_by(|a, b| a.partial_cmp(b).unwrap());
result.dedup(); result.dedup();
result result
@@ -199,7 +199,7 @@ impl<T: RealNumber + Scalar + AddAssign + SubAssign + MulAssign + DivAssign + Su
} }
fn get_row_as_vec(&self, row: usize) -> Vec<T> { fn get_row_as_vec(&self, row: usize) -> Vec<T> {
self.row(row).iter().map(|v| *v).collect() self.row(row).iter().copied().collect()
} }
fn get_row(&self, row: usize) -> Self::RowVector { fn get_row(&self, row: usize) -> Self::RowVector {
@@ -207,22 +207,18 @@ impl<T: RealNumber + Scalar + AddAssign + SubAssign + MulAssign + DivAssign + Su
} }
fn copy_row_as_vec(&self, row: usize, result: &mut Vec<T>) { fn copy_row_as_vec(&self, row: usize, result: &mut Vec<T>) {
let mut r = 0; for (r, e) in self.row(row).iter().enumerate() {
for e in self.row(row).iter() {
result[r] = *e; result[r] = *e;
r += 1;
} }
} }
fn get_col_as_vec(&self, col: usize) -> Vec<T> { fn get_col_as_vec(&self, col: usize) -> Vec<T> {
self.column(col).iter().map(|v| *v).collect() self.column(col).iter().copied().collect()
} }
fn copy_col_as_vec(&self, col: usize, result: &mut Vec<T>) { fn copy_col_as_vec(&self, col: usize, result: &mut Vec<T>) {
let mut r = 0; for (c, e) in self.column(col).iter().enumerate() {
for e in self.column(col).iter() { result[c] = *e;
result[r] = *e;
r += 1;
} }
} }
@@ -368,7 +364,7 @@ impl<T: RealNumber + Scalar + AddAssign + SubAssign + MulAssign + DivAssign + Su
let mut norm = T::zero(); let mut norm = T::zero();
for xi in self.iter() { for xi in self.iter() {
norm = norm + xi.abs().powf(p); norm += xi.abs().powf(p);
} }
norm.powf(T::one() / p) norm.powf(T::one() / p)
@@ -477,7 +473,7 @@ impl<T: RealNumber + Scalar + AddAssign + SubAssign + MulAssign + DivAssign + Su
for c in 0..self.ncols() { for c in 0..self.ncols() {
let p = (self[(r, c)] - max).exp(); let p = (self[(r, c)] - max).exp();
self.set(r, c, p); self.set(r, c, p);
z = z + p; z += p;
} }
} }
for r in 0..self.nrows() { for r in 0..self.nrows() {
@@ -514,7 +510,7 @@ impl<T: RealNumber + Scalar + AddAssign + SubAssign + MulAssign + DivAssign + Su
} }
fn unique(&self) -> Vec<T> { fn unique(&self) -> Vec<T> {
let mut result: Vec<T> = self.iter().map(|v| *v).collect(); let mut result: Vec<T> = self.iter().copied().collect();
result.sort_by(|a, b| a.partial_cmp(b).unwrap()); result.sort_by(|a, b| a.partial_cmp(b).unwrap());
result.dedup(); result.dedup();
result result
src/linalg/ndarray_bindings.rs
+14 -18
View File
@@ -117,7 +117,7 @@ impl<T: RealNumber + ScalarOperand> BaseVector<T> for ArrayBase<OwnedRepr<T>, Ix
let mut norm = T::zero(); let mut norm = T::zero();
for xi in self.iter() { for xi in self.iter() {
norm = norm + xi.abs().powf(p); norm += xi.abs().powf(p);
} }
norm.powf(T::one() / p) norm.powf(T::one() / p)
@@ -125,19 +125,19 @@ impl<T: RealNumber + ScalarOperand> BaseVector<T> for ArrayBase<OwnedRepr<T>, Ix
} }
fn div_element_mut(&mut self, pos: usize, x: T) { fn div_element_mut(&mut self, pos: usize, x: T) {
self[pos] = self[pos] / x; self[pos] /= x;
} }
fn mul_element_mut(&mut self, pos: usize, x: T) { fn mul_element_mut(&mut self, pos: usize, x: T) {
self[pos] = self[pos] * x; self[pos] *= x;
} }
fn add_element_mut(&mut self, pos: usize, x: T) { fn add_element_mut(&mut self, pos: usize, x: T) {
self[pos] = self[pos] + x; self[pos] += x;
} }
fn sub_element_mut(&mut self, pos: usize, x: T) { fn sub_element_mut(&mut self, pos: usize, x: T) {
self[pos] = self[pos] - x; self[pos] -= x;
} }
fn approximate_eq(&self, other: &Self, error: T) -> bool { fn approximate_eq(&self, other: &Self, error: T) -> bool {
@@ -204,10 +204,8 @@ impl<T: RealNumber + ScalarOperand + AddAssign + SubAssign + MulAssign + DivAssi
} }
fn copy_row_as_vec(&self, row: usize, result: &mut Vec<T>) { fn copy_row_as_vec(&self, row: usize, result: &mut Vec<T>) {
let mut r = 0; for (r, e) in self.row(row).iter().enumerate() {
for e in self.row(row).iter() {
result[r] = *e; result[r] = *e;
r += 1;
} }
} }
@@ -216,10 +214,8 @@ impl<T: RealNumber + ScalarOperand + AddAssign + SubAssign + MulAssign + DivAssi
} }
fn copy_col_as_vec(&self, col: usize, result: &mut Vec<T>) { fn copy_col_as_vec(&self, col: usize, result: &mut Vec<T>) {
let mut r = 0; for (c, e) in self.column(col).iter().enumerate() {
for e in self.column(col).iter() { result[c] = *e;
result[r] = *e;
r += 1;
} }
} }
@@ -347,7 +343,7 @@ impl<T: RealNumber + ScalarOperand + AddAssign + SubAssign + MulAssign + DivAssi
let mut norm = T::zero(); let mut norm = T::zero();
for xi in self.iter() { for xi in self.iter() {
norm = norm + xi.abs().powf(p); norm += xi.abs().powf(p);
} }
norm.powf(T::one() / p) norm.powf(T::one() / p)
@@ -359,19 +355,19 @@ impl<T: RealNumber + ScalarOperand + AddAssign + SubAssign + MulAssign + DivAssi
} }
fn div_element_mut(&mut self, row: usize, col: usize, x: T) { fn div_element_mut(&mut self, row: usize, col: usize, x: T) {
self[[row, col]] = self[[row, col]] / x; self[[row, col]] /= x;
} }
fn mul_element_mut(&mut self, row: usize, col: usize, x: T) { fn mul_element_mut(&mut self, row: usize, col: usize, x: T) {
self[[row, col]] = self[[row, col]] * x; self[[row, col]] *= x;
} }
fn add_element_mut(&mut self, row: usize, col: usize, x: T) { fn add_element_mut(&mut self, row: usize, col: usize, x: T) {
self[[row, col]] = self[[row, col]] + x; self[[row, col]] += x;
} }
fn sub_element_mut(&mut self, row: usize, col: usize, x: T) { fn sub_element_mut(&mut self, row: usize, col: usize, x: T) {
self[[row, col]] = self[[row, col]] - x; self[[row, col]] -= x;
} }
fn negative_mut(&mut self) { fn negative_mut(&mut self) {
@@ -425,7 +421,7 @@ impl<T: RealNumber + ScalarOperand + AddAssign + SubAssign + MulAssign + DivAssi
for c in 0..self.ncols() { for c in 0..self.ncols() {
let p = (self[(r, c)] - max).exp(); let p = (self[(r, c)] - max).exp();
self.set(r, c, p); self.set(r, c, p);
z = z + p; z += p;
} }
} }
for r in 0..self.nrows() { for r in 0..self.nrows() {
src/model_selection/mod.rs
+4 -4
View File
@@ -292,10 +292,10 @@ mod tests {
let x: DenseMatrix<f64> = DenseMatrix::rand(23, 100); let x: DenseMatrix<f64> = DenseMatrix::rand(23, 100);
let train_test_splits = k.split(&x); let train_test_splits = k.split(&x);
assert_eq!(train_test_splits[0].1.len(), 12 as usize); assert_eq!(train_test_splits[0].1.len(), 12_usize);
assert_eq!(train_test_splits[0].0.len(), 11 as usize); assert_eq!(train_test_splits[0].0.len(), 11_usize);
assert_eq!(train_test_splits[1].0.len(), 12 as usize); assert_eq!(train_test_splits[1].0.len(), 12_usize);
assert_eq!(train_test_splits[1].1.len(), 11 as usize); assert_eq!(train_test_splits[1].1.len(), 11_usize);
} }
#[test] #[test]