fix: renames FloatExt to RealNumber
This commit is contained in:
@@ -1,30 +1,32 @@
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::math::num::FloatExt;
|
||||
use crate::math::num::RealNumber;
|
||||
|
||||
use super::Distance;
|
||||
|
||||
#[derive(Serialize, Deserialize, Debug)]
|
||||
pub struct Minkowski<T: FloatExt> {
|
||||
pub p: T,
|
||||
pub struct Minkowski {
|
||||
pub p: u16,
|
||||
}
|
||||
|
||||
impl<T: FloatExt> Distance<Vec<T>, T> for Minkowski<T> {
|
||||
impl<T: RealNumber> Distance<Vec<T>, T> for Minkowski {
|
||||
fn distance(&self, x: &Vec<T>, y: &Vec<T>) -> T {
|
||||
if x.len() != y.len() {
|
||||
panic!("Input vector sizes are different");
|
||||
}
|
||||
if self.p < T::one() {
|
||||
if self.p < 1 {
|
||||
panic!("p must be at least 1");
|
||||
}
|
||||
|
||||
let mut dist = T::zero();
|
||||
let p_t = T::from_u16(self.p).unwrap();
|
||||
|
||||
for i in 0..x.len() {
|
||||
let d = (x[i] - y[i]).abs();
|
||||
dist = dist + d.powf(self.p);
|
||||
dist = dist + d.powf(p_t);
|
||||
}
|
||||
|
||||
dist.powf(T::one() / self.p)
|
||||
dist.powf(T::one() / p_t)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -37,9 +39,9 @@ mod tests {
|
||||
let a = vec![1., 2., 3.];
|
||||
let b = vec![4., 5., 6.];
|
||||
|
||||
let l1: f64 = Minkowski { p: 1.0 }.distance(&a, &b);
|
||||
let l2: f64 = Minkowski { p: 2.0 }.distance(&a, &b);
|
||||
let l3: f64 = Minkowski { p: 3.0 }.distance(&a, &b);
|
||||
let l1: f64 = Minkowski { p: 1 }.distance(&a, &b);
|
||||
let l2: f64 = Minkowski { p: 2 }.distance(&a, &b);
|
||||
let l3: f64 = Minkowski { p: 3 }.distance(&a, &b);
|
||||
|
||||
assert!((l1 - 9.0).abs() < 1e-8);
|
||||
assert!((l2 - 5.19615242).abs() < 1e-8);
|
||||
@@ -52,6 +54,6 @@ mod tests {
|
||||
let a = vec![1., 2., 3.];
|
||||
let b = vec![4., 5., 6.];
|
||||
|
||||
let _: f64 = Minkowski { p: 0.0 }.distance(&a, &b);
|
||||
let _: f64 = Minkowski { p: 0 }.distance(&a, &b);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user