From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 26 Nov 2017 22:11:23 +0000 (+0000)
Subject: Revert "helixish: use @ for matrix multiplication"
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=f5e9aeddcde7756a49396a149afd2fab080c840b;p=moebius3.git

Revert "helixish: use @ for matrix multiplication"

Actually we want this to be useable with python-visual which in
stretch is python2 so we have to convert the matrices to type matrix.

This reverts commit 390d3621fcf18d8e1a98a8ff77a85dcaa61f4ed9.
---

diff --git a/helixish.py b/helixish.py
index 1536ce6..c5c30d7 100644
--- a/helixish.py
+++ b/helixish.py
@@ -52,10 +52,9 @@ class HelixishCurve():
     dPQplane_basis = np.vstack((dPQplane_basis, [0,0,0,1]))
     dPQplane_into = np.linalg.inv(dPQplane_basis)
 
-    dp_plane = unaugment(dPQplane_into @ augment0(dp))
-    dq_plane = unaugment(dPQplane_into @ augment0(dq))
-    q_plane  = dPQplane_into @ augment(q)
-    q_plane  = unaugment(dPQplane_into @ augment(q))
+    dp_plane = unaugment(dPQplane_into * augment0(dp))
+    dq_plane = unaugment(dPQplane_into * augment0(dq))
+    q_plane  = unaugment(dPQplane_into * augment(q))
     dist_pq_plane = np.linalg.norm(q_plane)
 
     # two circular arcs of equal maximum possible radius