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

fix: changes recommended by Clippy

Browse Source
This commit is contained in:
Volodymyr Orlov
2020-11-11 17:23:49 -08:00
parent 8f72716fe9
commit f0371673a4
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/linear/logistic_regression.rs
+8 -8
View File
@@ -111,7 +111,7 @@ impl<T: RealNumber, M: Matrix<T>> PartialEq for LogisticRegression<T, M> {
} }
} }
return self.coefficients == other.coefficients && self.intercept == other.intercept; self.coefficients == other.coefficients && self.intercept == other.intercept
} }
} }
} }
@@ -242,7 +242,7 @@ impl<T: RealNumber, M: Matrix<T>> LogisticRegression<T, M> {
let x0 = M::zeros(1, num_attributes + 1); let x0 = M::zeros(1, num_attributes + 1);
let objective = BinaryObjectiveFunction { let objective = BinaryObjectiveFunction {
x: x, x,
y: yi, y: yi,
phantom: PhantomData, phantom: PhantomData,
}; };
@@ -254,8 +254,8 @@ impl<T: RealNumber, M: Matrix<T>> LogisticRegression<T, M> {
Ok(LogisticRegression { Ok(LogisticRegression {
coefficients: weights.slice(0..1, 0..num_attributes), coefficients: weights.slice(0..1, 0..num_attributes),
intercept: weights.slice(0..1, num_attributes..num_attributes + 1), intercept: weights.slice(0..1, num_attributes..num_attributes + 1),
classes: classes, classes,
num_attributes: num_attributes, num_attributes,
num_classes: k, num_classes: k,
}) })
} }
@@ -263,9 +263,9 @@ impl<T: RealNumber, M: Matrix<T>> LogisticRegression<T, M> {
let x0 = M::zeros(1, (num_attributes + 1) * k); let x0 = M::zeros(1, (num_attributes + 1) * k);
let objective = MultiClassObjectiveFunction { let objective = MultiClassObjectiveFunction {
x: x, x,
y: yi, y: yi,
k: k, k,
phantom: PhantomData, phantom: PhantomData,
}; };
@@ -275,8 +275,8 @@ impl<T: RealNumber, M: Matrix<T>> LogisticRegression<T, M> {
Ok(LogisticRegression { Ok(LogisticRegression {
coefficients: weights.slice(0..k, 0..num_attributes), coefficients: weights.slice(0..k, 0..num_attributes),
intercept: weights.slice(0..k, num_attributes..num_attributes + 1), intercept: weights.slice(0..k, num_attributes..num_attributes + 1),
classes: classes, classes,
num_attributes: num_attributes, num_attributes,
num_classes: k, num_classes: k,
}) })
} }
src/linear/ridge_regression.rs
+3 -3
View File
@@ -129,13 +129,13 @@ impl<T: RealNumber, M: Matrix<T>> RidgeRegression<T, M> {
let (n, p) = x.shape(); let (n, p) = x.shape();
if n <= p { if n <= p {
return Err(Failed::fit(&format!( return Err(Failed::fit(
"Number of rows in X should be >= number of columns in X" "Number of rows in X should be >= number of columns in X"
))); ));
} }
if y.len() != n { if y.len() != n {
return Err(Failed::fit(&format!("Number of rows in X should = len(y)"))); return Err(Failed::fit("Number of rows in X should = len(y)"));
} }
let y_column = M::from_row_vector(y.clone()).transpose(); let y_column = M::from_row_vector(y.clone()).transpose();