X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=helixish.py;h=27485eac5e965293e7311976f39466fef807ca08;hb=f888ccc82f4228b3acfbc66560f185a649ac4730;hp=bf8083fbd35dcc137f044027461e59bd0610003a;hpb=db59c229b019128b1c4d46bcc9ad61f06e7f2be9;p=moebius3.git

diff --git a/helixish.py b/helixish.py
index bf8083f..27485ea 100644
--- a/helixish.py
+++ b/helixish.py
@@ -169,8 +169,6 @@ class HelixishCurve():
         try_s = railway_ST(railway_CP, [0,0], railway_midpt, railway_r)
         try_t = railway_ST(railway_CP, railway_midpt, q_plane[0:2], railway_r)
         dbg('try_s, _t', try_s, try_t)
-        if try_s < 0 or try_t < 0:
-          continue
 
         try_st = try_s + try_t
         if best_st is None or try_st < best_st:
@@ -254,6 +252,7 @@ class HelixishCurve():
     findcurve_subproc.stdin.flush()
 
     hc.func = symbolic.get_python()
+    hc.findcurve_basis = findcurve_basis
     commentary = ''
 
     while True:
@@ -289,4 +288,5 @@ class HelixishCurve():
       ours[1] = sqrt(dist - hc.threshold)
     asmat = hc.func(*ours)
     p = asmat[:,0]
+    p = augmatmultiply(hc.findcurve_basis, p)
     return p