Run: cargo clippy --fix -Z unstable-options and cargo fmt
This commit is contained in:
@@ -38,7 +38,7 @@ impl Euclidian {
|
||||
let mut sum = T::zero();
|
||||
for i in 0..x.len() {
|
||||
let d = x[i] - y[i];
|
||||
sum = sum + d * d;
|
||||
sum += d * d;
|
||||
}
|
||||
|
||||
sum
|
||||
|
||||
@@ -68,8 +68,8 @@ impl<T: RealNumber, M: Matrix<T>> Mahalanobis<T, M> {
|
||||
let sigma = data.cov();
|
||||
let sigmaInv = sigma.lu().and_then(|lu| lu.inverse()).unwrap();
|
||||
Mahalanobis {
|
||||
sigma: sigma,
|
||||
sigmaInv: sigmaInv,
|
||||
sigma,
|
||||
sigmaInv,
|
||||
t: PhantomData,
|
||||
}
|
||||
}
|
||||
@@ -80,8 +80,8 @@ impl<T: RealNumber, M: Matrix<T>> Mahalanobis<T, M> {
|
||||
let sigma = cov.clone();
|
||||
let sigmaInv = sigma.lu().and_then(|lu| lu.inverse()).unwrap();
|
||||
Mahalanobis {
|
||||
sigma: sigma,
|
||||
sigmaInv: sigmaInv,
|
||||
sigma,
|
||||
sigmaInv,
|
||||
t: PhantomData,
|
||||
}
|
||||
}
|
||||
@@ -118,7 +118,7 @@ impl<T: RealNumber, M: Matrix<T>> Distance<Vec<T>, T> for Mahalanobis<T, M> {
|
||||
let mut s = T::zero();
|
||||
for j in 0..n {
|
||||
for i in 0..n {
|
||||
s = s + self.sigmaInv.get(i, j) * z[i] * z[j];
|
||||
s += self.sigmaInv.get(i, j) * z[i] * z[j];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ impl<T: RealNumber> Distance<Vec<T>, T> for Manhattan {
|
||||
|
||||
let mut dist = T::zero();
|
||||
for i in 0..x.len() {
|
||||
dist = dist + (x[i] - y[i]).abs();
|
||||
dist += (x[i] - y[i]).abs();
|
||||
}
|
||||
|
||||
dist
|
||||
|
||||
@@ -48,7 +48,7 @@ impl<T: RealNumber> Distance<Vec<T>, T> for Minkowski {
|
||||
|
||||
for i in 0..x.len() {
|
||||
let d = (x[i] - y[i]).abs();
|
||||
dist = dist + d.powf(p_t);
|
||||
dist += d.powf(p_t);
|
||||
}
|
||||
|
||||
dist.powf(T::one() / p_t)
|
||||
|
||||
@@ -45,7 +45,7 @@ impl Distances {
|
||||
/// Minkowski distance, see [`Minkowski`](minkowski/index.html)
|
||||
/// * `p` - function order. Should be >= 1
|
||||
pub fn minkowski(p: u16) -> minkowski::Minkowski {
|
||||
minkowski::Minkowski { p: p }
|
||||
minkowski::Minkowski { p }
|
||||
}
|
||||
|
||||
/// Manhattan distance, see [`Manhattan`](manhattan/index.html)
|
||||
|
||||
+10
-10
@@ -57,19 +57,19 @@ impl RealNumber for f64 {
|
||||
|
||||
fn ln_1pe(self) -> f64 {
|
||||
if self > 15. {
|
||||
return self;
|
||||
self
|
||||
} else {
|
||||
return self.exp().ln_1p();
|
||||
self.exp().ln_1p()
|
||||
}
|
||||
}
|
||||
|
||||
fn sigmoid(self) -> f64 {
|
||||
if self < -40. {
|
||||
return 0.;
|
||||
0.
|
||||
} else if self > 40. {
|
||||
return 1.;
|
||||
1.
|
||||
} else {
|
||||
return 1. / (1. + f64::exp(-self));
|
||||
1. / (1. + f64::exp(-self))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,19 +98,19 @@ impl RealNumber for f32 {
|
||||
|
||||
fn ln_1pe(self) -> f32 {
|
||||
if self > 15. {
|
||||
return self;
|
||||
self
|
||||
} else {
|
||||
return self.exp().ln_1p();
|
||||
self.exp().ln_1p()
|
||||
}
|
||||
}
|
||||
|
||||
fn sigmoid(self) -> f32 {
|
||||
if self < -40. {
|
||||
return 0.;
|
||||
0.
|
||||
} else if self > 40. {
|
||||
return 1.;
|
||||
1.
|
||||
} else {
|
||||
return 1. / (1. + f32::exp(-self));
|
||||
1. / (1. + f32::exp(-self))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user