Solve conflic with num-traits (#130)
* Solve conflic with num-traits * Fix clippy warnings Co-authored-by: Luis Moreno <morenol@users.noreply.github.com>
This commit is contained in:
@@ -155,11 +155,11 @@ impl<T: RealNumber + Sum, D: Distance<Vec<T>, T>> DBSCAN<T, D> {
|
||||
parameters: DBSCANParameters<T, D>,
|
||||
) -> Result<DBSCAN<T, D>, Failed> {
|
||||
if parameters.min_samples < 1 {
|
||||
return Err(Failed::fit(&"Invalid minPts".to_string()));
|
||||
return Err(Failed::fit("Invalid minPts"));
|
||||
}
|
||||
|
||||
if parameters.eps <= T::zero() {
|
||||
return Err(Failed::fit(&"Invalid radius: ".to_string()));
|
||||
return Err(Failed::fit("Invalid radius: "));
|
||||
}
|
||||
|
||||
let mut k = 0;
|
||||
|
||||
@@ -71,9 +71,9 @@ use crate::math::num::RealNumber;
|
||||
#[derive(Debug)]
|
||||
pub struct KMeans<T: RealNumber> {
|
||||
k: usize,
|
||||
y: Vec<usize>,
|
||||
_y: Vec<usize>,
|
||||
size: Vec<usize>,
|
||||
distortion: T,
|
||||
_distortion: T,
|
||||
centroids: Vec<Vec<T>>,
|
||||
}
|
||||
|
||||
@@ -208,9 +208,9 @@ impl<T: RealNumber + Sum> KMeans<T> {
|
||||
|
||||
Ok(KMeans {
|
||||
k: parameters.k,
|
||||
y,
|
||||
_y: y,
|
||||
size,
|
||||
distortion,
|
||||
_distortion: distortion,
|
||||
centroids,
|
||||
})
|
||||
}
|
||||
@@ -344,7 +344,7 @@ mod tests {
|
||||
let y = kmeans.predict(&x).unwrap();
|
||||
|
||||
for i in 0..y.len() {
|
||||
assert_eq!(y[i] as usize, kmeans.y[i]);
|
||||
assert_eq!(y[i] as usize, kmeans._y[i]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user