helixish: better debug

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/helixish.py b/helixish.py
index 219ec350bd8edaeb159354b4a827ca99e76a607c..5978478cfdd49f880eaf0017f47c0e05c484dda5 100644 (file)
--- a/helixish.py
+++ b/helixish.py
@@ -164,7 +164,16 @@ class HelixishCurve():
     findcurve_input = np.hstack((findcurve_target,
                                  findcurve_start,
                                  [findcurve_epsilon]))
-    dbg('RUNNING FINDCURVE', *findcurve_input)
+
+    dbg(('RUNNING FINDCURVE                           ' +
+         ' target Q=[%5.2f %5.2f %5.2f] dQ=[%5.2f %5.2f %5.2f]')
+        %
+        tuple(findcurve_input[0:6]))
+    dbg(('s=%5.2f t=%5.2f la=%5.2f mu=%5.2f ga=%5.2f ka=%5.2f  initial')
+        %
+        (( findcurve_input[6]**2, findcurve_input[7]**2 ) +
+         tuple(findcurve_input[8:12])))
+
     print(*findcurve_input, file=findcurve_subproc.stdin)
     findcurve_subproc.stdin.flush()
 
@@ -173,11 +182,16 @@ class HelixishCurve():
     while True:
       l = findcurve_subproc.stdout.readline()
       l = l.rstrip()
-      dbg('GOT ', l)
+      #dbg('GOT ', l)
       if not l: vdbg().crashing('findcurve EOF')
       l = eval(l)
       if l is None: break
 
+      dbg(('s=%5.2f t=%5.2f la=%5.2f mu=%5.2f ga=%5.2f ka=%5.2f' +
+           ' Q=[%5.2f %5.2f %5.2f] dQ=[%5.2f %5.2f %5.2f]')
+          %
+          (( l[0]**2, l[1]**2 ) + tuple(l[2:12])))
+
       hc.findcurve_result = l[0:6]
       hc.threshold = l[0]**2
       hc.total_dist = hc.threshold + l[1]**2