Run: cargo clippy --fix -Z unstable-options and cargo fmt
This commit is contained in:
@@ -78,7 +78,7 @@ impl<T: RealNumber, D: Distance<Vec<T>, T>> PartialEq for KNNClassifier<T, D> {
|
||||
|| self.k != other.k
|
||||
|| self.y.len() != other.y.len()
|
||||
{
|
||||
return false;
|
||||
false
|
||||
} else {
|
||||
for i in 0..self.classes.len() {
|
||||
if (self.classes[i] - other.classes[i]).abs() > T::epsilon() {
|
||||
@@ -139,7 +139,7 @@ impl<T: RealNumber, D: Distance<Vec<T>, T>> KNNClassifier<T, D> {
|
||||
}
|
||||
|
||||
Ok(KNNClassifier {
|
||||
classes: classes,
|
||||
classes,
|
||||
y: yi,
|
||||
k: parameters.k,
|
||||
knn_algorithm: parameters.algorithm.fit(data, distance)?,
|
||||
@@ -166,13 +166,13 @@ impl<T: RealNumber, D: Distance<Vec<T>, T>> KNNClassifier<T, D> {
|
||||
let weights = self
|
||||
.weight
|
||||
.calc_weights(search_result.iter().map(|v| v.1).collect());
|
||||
let w_sum = weights.iter().map(|w| *w).sum();
|
||||
let w_sum = weights.iter().copied().sum();
|
||||
|
||||
let mut c = vec![T::zero(); self.classes.len()];
|
||||
let mut max_c = T::zero();
|
||||
let mut max_i = 0;
|
||||
for (r, w) in search_result.iter().zip(weights.iter()) {
|
||||
c[self.y[r.0]] = c[self.y[r.0]] + (*w / w_sum);
|
||||
c[self.y[r.0]] += *w / w_sum;
|
||||
if c[self.y[r.0]] > max_c {
|
||||
max_c = c[self.y[r.0]];
|
||||
max_i = self.y[r.0];
|
||||
|
||||
@@ -76,7 +76,7 @@ impl Default for KNNRegressorParameters {
|
||||
impl<T: RealNumber, D: Distance<Vec<T>, T>> PartialEq for KNNRegressor<T, D> {
|
||||
fn eq(&self, other: &Self) -> bool {
|
||||
if self.k != other.k || self.y.len() != other.y.len() {
|
||||
return false;
|
||||
false
|
||||
} else {
|
||||
for i in 0..self.y.len() {
|
||||
if (self.y[i] - other.y[i]).abs() > T::epsilon() {
|
||||
@@ -151,10 +151,10 @@ impl<T: RealNumber, D: Distance<Vec<T>, T>> KNNRegressor<T, D> {
|
||||
let weights = self
|
||||
.weight
|
||||
.calc_weights(search_result.iter().map(|v| v.1).collect());
|
||||
let w_sum = weights.iter().map(|w| *w).sum();
|
||||
let w_sum = weights.iter().copied().sum();
|
||||
|
||||
for (r, w) in search_result.iter().zip(weights.iter()) {
|
||||
result = result + self.y[r.0] * (*w / w_sum);
|
||||
result += self.y[r.0] * (*w / w_sum);
|
||||
}
|
||||
|
||||
Ok(result)
|
||||
|
||||
Reference in New Issue
Block a user