From 4ad771959c9ef2ed9f847c5cfff565ac6e7db089 Mon Sep 17 00:00:00 2001 From: Jim Eckerlein Date: Mon, 29 Aug 2022 16:43:48 +0200 Subject: [PATCH] Fix naming Branch is (e12, e23, e31) Ideal line is (e01, e02, e03) --- .github/workflows/actions.yaml | 2 +- src/lib.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml index 46fc3e7..a041669 100644 --- a/.github/workflows/actions.yaml +++ b/.github/workflows/actions.yaml @@ -36,7 +36,7 @@ jobs: - name: epga3d descriptor: "epga3d:1,1,1,1;Scalar:1;MultiVector:1,e23,-e13,e12|e0,-e023,e013,-e012|e123,e1,e2,e3|e0123,e01,e02,e03;Rotor:1,e23,-e13,e12;Point:e123,-e023,e013,-e012;Plane:e0,e1,e2,e3;Line:e01,e02,e03|e23,-e13,e12;Translator:1,e01,e02,e03;Motor:1,e23,-e13,e12|e0123,e01,e02,e03;PointAndPlane:e123,-e023,e013,-e012|e0,e1,e2,e3" - name: ppga3d - descriptor: "ppga3d:0,1,1,1;Scalar:1;MultiVector:1,e23,-e13,e12|e0,-e023,e013,-e012|e123,e1,e2,e3|e0123,e01,e02,e03;Rotor:1,e23,-e13,e12;Point:e123,-e023,e013,-e012;Plane:e0,e1,e2,e3;Line:e01,e02,e03|e23,-e13,e12;Branch:e01,e02,e03;Translator:1,e01,e02,e03;Motor:1,e23,-e13,e12|e0123,e01,e02,e03;PointAndPlane:e123,-e023,e013,-e012|e0,e1,e2,e3" + descriptor: "ppga3d:0,1,1,1;Scalar:1;MultiVector:1,e23,-e13,e12|e0,-e023,e013,-e012|e123,e1,e2,e3|e0123,e01,e02,e03;Rotor:1,e23,-e13,e12;Point:e123,-e023,e013,-e012;Plane:e0,e1,e2,e3;Line:e01,e02,e03|e23,-e13,e12;IdealLine:e01,e02,e03;Translator:1,e01,e02,e03;Motor:1,e23,-e13,e12|e0123,e01,e02,e03;PointAndPlane:e123,-e023,e013,-e012|e0,e1,e2,e3" - name: hpga3d descriptor: "hpga3d:-1,1,1,1;Scalar:1;MultiVector:1,e23,-e13,e12|e0,-e023,e013,-e012|e123,e1,e2,e3|e0123,e01,e02,e03;Rotor:1,e23,-e13,e12;Point:e123,-e023,e013,-e012;Plane:e0,e1,e2,e3;Line:e01,e02,e03|e23,-e13,e12;Translator:1,e01,e02,e03;Motor:1,e23,-e13,e12|e0123,e01,e02,e03;PointAndPlane:e123,-e023,e013,-e012|e0,e1,e2,e3" steps: diff --git a/src/lib.rs b/src/lib.rs index fe96801..29778d8 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -206,7 +206,7 @@ impl Powf for ppga3d::Motor { } } -impl Exp for ppga3d::Branch { +impl Exp for ppga3d::IdealLine { type Output = ppga3d::Translator; fn exp(self) -> ppga3d::Translator { @@ -219,10 +219,10 @@ impl Exp for ppga3d::Branch { } impl Ln for ppga3d::Translator { - type Output = ppga3d::Branch; + type Output = ppga3d::IdealLine; - fn ln(self) -> ppga3d::Branch { - ppga3d::Branch { + fn ln(self) -> ppga3d::IdealLine { + ppga3d::IdealLine { g0: simd::Simd32x3 { f32x3: [self.g0[1] / self.g0[0], self.g0[2] / self.g0[0], self.g0[3] / self.g0[0]], }