From 0643c7ff48539e819f2b1eb1defed0c83ed38488 Mon Sep 17 00:00:00 2001 From: Rouven Spreckels Date: Mon, 11 Mar 2024 17:14:35 +0100 Subject: [PATCH] Avoid matrix multiplication. --- src/base/cg.rs | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/base/cg.rs b/src/base/cg.rs index 812ce19d3..8e0f028cc 100644 --- a/src/base/cg.rs +++ b/src/base/cg.rs @@ -89,16 +89,14 @@ where SC: Storage + Clone, { let (a, b, ab) = (from.as_ref(), to.as_ref(), from.dot(to)); - let d = T::one() + ab; + let d = T::one() + ab.clone(); (d > T::default_epsilon().sqrt()).then(|| { - let k = &(b * a.transpose() - a * b.transpose()); + let [at, bt] = &[a.transpose(), b.transpose()]; + let [b_at, a_bt, a_at, b_bt] = &[b * at, a * bt, a * at, b * bt]; + let [k1, k2] = [b_at - a_bt, (b_at + a_bt) * ab - (a_at + b_bt)]; // Codesido's Rotation Formula // - // - // Equals `Self::identity() + k + k * k / d`: - let mut r = Self::identity() + k; - r.gemm(d.recip(), k, k, T::one()); - r + Self::identity() + k1 + k2 / d }) } /// The n-dimensional rotation matrix described by an oriented minor arc and a signed angle. @@ -120,7 +118,7 @@ where .try_normalize(T::default_epsilon().sqrt()) .map(|ref b| { let (sin, cos) = angle.sin_cos(); - let [at, bt] = [&a.transpose(), &b.transpose()]; + let [at, bt] = &[a.transpose(), b.transpose()]; let [k1, k2] = [b * at - a * bt, -(a * at + b * bt)]; // Simple rotations / Rotation in a two–plane //