diff options
-rw-r--r-- | src/embedders/vecmetric.rs | 17 | ||||
-rw-r--r-- | src/main.rs | 4 |
2 files changed, 20 insertions, 1 deletions
diff --git a/src/embedders/vecmetric.rs b/src/embedders/vecmetric.rs index 65d71df..2ebd170 100644 --- a/src/embedders/vecmetric.rs +++ b/src/embedders/vecmetric.rs @@ -6,14 +6,18 @@ pub trait VecMetric: MetricElem + From<Vec<f32>> {} #[derive(Decode, Encode)] pub struct AngularDistance(pub Vec<f32>); #[derive(Decode, Encode)] +pub struct CosineDistance(pub Vec<f32>); +#[derive(Decode, Encode)] pub struct EuclidianDistance(pub Vec<f32>); #[derive(Decode, Encode)] pub struct ManhattenDistance(pub Vec<f32>); impl VecMetric for AngularDistance {} +impl VecMetric for CosineDistance {} impl VecMetric for EuclidianDistance {} impl VecMetric for ManhattenDistance {} #[rustfmt::skip] impl From<Vec<f32>> for AngularDistance { fn from(value: Vec<f32>) -> Self { Self(value) } } +#[rustfmt::skip] impl From<Vec<f32>> for CosineDistance { fn from(value: Vec<f32>) -> Self { Self(value) } } #[rustfmt::skip] impl From<Vec<f32>> for EuclidianDistance { fn from(value: Vec<f32>) -> Self { Self(value) } } #[rustfmt::skip] impl From<Vec<f32>> for ManhattenDistance { fn from(value: Vec<f32>) -> Self { Self(value) } } @@ -28,7 +32,18 @@ impl MetricElem for AngularDistance { let mag_a = self.0.iter().map(|x| x.powi(2)).sum::<f32>(); let mag_b = other.0.iter().map(|x| x.powi(2)).sum::<f32>(); let cossim = x / (mag_a * mag_b).sqrt(); - cossim.acos() as f64 + // clamp is require because floating point errors + cossim.clamp(-1., 1.).acos() as f64 + } +} +impl MetricElem for CosineDistance { + fn dist(&self, other: &Self) -> f64 { + self.0 + .iter() + .zip(other.0.iter()) + .map(|(a, b)| (*a - *b) * (*b - *a)) + .sum::<f32>() + .sqrt() as f64 } } impl MetricElem for EuclidianDistance { diff --git a/src/main.rs b/src/main.rs index 3055768..1cc380f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -26,6 +26,7 @@ enum Embedder { Color, ContentEuclidean, ContentAngularDistance, + ContentCosine, ContentManhatten, } @@ -230,6 +231,9 @@ fn main() -> Result<()> { Embedder::ContentAngularDistance => { process_embedder(ContentEmbedder::<AngularDistance>::new(&cfg), &args, &cfg) } + Embedder::ContentCosine => { + process_embedder(ContentEmbedder::<CosineDistance>::new(&cfg), &args, &cfg) + } Embedder::ContentEuclidean => { process_embedder(ContentEmbedder::<EuclidianDistance>::new(&cfg), &args, &cfg) } |