chiark / gitweb /
Ian Jackson [Sat, 7 Apr 2018 21:29:12 +0000 (22:29 +0100)]
visual: reduce nv and nw for debugging
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 21:28:53 +0000 (22:28 +0100)]
curveopt.py: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 20:26:02 +0000 (21:26 +0100)]
curveopt.py: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 20:06:26 +0000 (21:06 +0100)]
moebius: break out moebez.py
curveopt is going to want these. We need to move it into a separate
file to avoid a circular import dependency.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 20:02:03 +0000 (21:02 +0100)]
curveopt: rename from helixish
We're going to want to reuse the findcurve invocation machinery. Most
of the rest of this is specific to the abandoned helixish approach, so
is due to be hacked away. For now just rename this unused file.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 20:00:14 +0000 (21:00 +0100)]
moebius: break out DiscreteBezier (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 19:52:12 +0000 (20:52 +0100)]
moebius: pass nt and it to MoebiusHalf, rather than just t
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 19:47:45 +0000 (20:47 +0100)]
curveopt: symbolic: compiles
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 19:37:48 +0000 (20:37 +0100)]
curveopt: symbolic: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 18:42:55 +0000 (19:42 +0100)]
curveopt: symbolic: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 18:25:21 +0000 (19:25 +0100)]
curveopt: symbolic: wip, before abandon provision for fdf
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 18:00:28 +0000 (19:00 +0100)]
curveopt: symbolic: wip, before go back to conditional in C
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 15:55:37 +0000 (16:55 +0100)]
curveopt: symbolic: wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 11:00:53 +0000 (12:00 +0100)]
Revert "RecursiveBezierishCurve: Try it"
This reverts commit
9a77b7a72b35200447e25c105ae383a1186a3899.
Ian Jackson [Sat, 7 Apr 2018 10:59:10 +0000 (11:59 +0100)]
RecursiveBezierishCurve: Try it
This does not seem to make any difference. How interesting. I
suspect that in fact this construction arranges, somehow, to get the
same cubics for the two halves as for the original. But I CBA to do
the algebra to check.
Ah well, we will revert this and try something else.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 10:01:35 +0000 (11:01 +0100)]
helixish: Abandon
Remove calls to Helixish and hence to findcurve et al.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 09:59:56 +0000 (10:59 +0100)]
Revert "helixish: try three paths"
This reverts commit
7de6976b27662081219291a52947d19bee422d44.
Ian Jackson [Sat, 7 Apr 2018 09:58:44 +0000 (10:58 +0100)]
helixish: try three paths
This shows that this approach does not work.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 7 Apr 2018 09:46:17 +0000 (10:46 +0100)]
Revert "visual: debugging with one in darker blue"
This reverts commit
756c4104abae08a963de109dd9a2ea4659698f40.
Ian Jackson [Sun, 31 Dec 2017 19:55:49 +0000 (19:55 +0000)]
Revert "helixish: attempt at the whole thing"
This reverts commit
906edec3ef60cf3e0567c713b2a68688edb634d4.
Ian Jackson [Sun, 31 Dec 2017 16:47:55 +0000 (16:47 +0000)]
helixish: attempt at the whole thing
This does not really work. Should revert and try bits of it
one at a time, etc.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Dec 2017 01:28:45 +0000 (01:28 +0000)]
helixish: seems to be able to solve
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Dec 2017 01:13:28 +0000 (01:13 +0000)]
helixish: seems to be able to solve but answer is wrong due to wrong energy
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Dec 2017 01:13:16 +0000 (01:13 +0000)]
helixish: debugging changes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Dec 2017 00:56:22 +0000 (00:56 +0000)]
helixish: fix .iters_fixed_T
If this is zero, gsl_siman_solve does not do anything.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Dec 2017 00:56:04 +0000 (00:56 +0000)]
helixish: debugging changes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 31 Dec 2017 00:55:20 +0000 (00:55 +0000)]
helixish: debugging changes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 23:22:57 +0000 (23:22 +0000)]
visual: debugging changes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 22:39:41 +0000 (22:39 +0000)]
helixish: fix sign problems
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 22:29:34 +0000 (22:29 +0000)]
helixish: remember to transform back from findcurve basis (!)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 22:28:44 +0000 (22:28 +0000)]
helixish: try_s and try_t now always >= 0
Since we add tau if necessary
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 22:28:33 +0000 (22:28 +0000)]
visual: debugging changes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 22:12:53 +0000 (22:12 +0000)]
visual: debugging with one in darker blue
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 20:34:21 +0000 (20:34 +0000)]
helixish: ensure s and t are >0
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 20:34:14 +0000 (20:34 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 19:28:39 +0000 (19:28 +0000)]
helixish: dist_pq_plane should be the distance in the dp/dq plane
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 19:28:18 +0000 (19:28 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 13:51:29 +0000 (13:51 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 13:51:01 +0000 (13:51 +0000)]
helixish: convert r from polynomial back to our unscaled plane coordinates
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 13:49:57 +0000 (13:49 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 13:49:36 +0000 (13:49 +0000)]
helixish: add a trivial comma (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 13:49:21 +0000 (13:49 +0000)]
helixish: rename vdbg_railway_angle for clarity (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 13:48:46 +0000 (13:48 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 13:11:25 +0000 (13:11 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 13:01:01 +0000 (13:01 +0000)]
visdebug: make circle of variable size
Existing arrows have their circle sizes adjusted according to the
lengths of the arrows.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 12:55:49 +0000 (12:55 +0000)]
visdebug: introduce vdbg().circle() (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 12:34:04 +0000 (12:34 +0000)]
helixish: get sense of phi right
In "Railway problem", phi is the direction we _leave_ Q. Whereas in
our original representation, we have a direction vector in the
positive sense of the parameter (ie, for Q, the arrival direction).
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 12:33:46 +0000 (12:33 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 12:31:00 +0000 (12:31 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 12:30:55 +0000 (12:30 +0000)]
helixish: angles are unconventionally represented in "Railway problem"
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 12:30:18 +0000 (12:30 +0000)]
helixish: make railway basis right-handed
Previously the y axis was reversed!
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 12:24:59 +0000 (12:24 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 12:17:01 +0000 (12:17 +0000)]
helixish: move so we put the basis stuff for debugging first
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 12:13:13 +0000 (12:13 +0000)]
Revert "helixish: railway_inplane_basis should not include a scale factor"
This reverts commit
5aba1dbd37afe0078ba09dbf6cf142b559d82d2b.
OK, so we'll make the railway basis have a scale in the (x,y) plane
so that Q is at [1,0,0]. This is used for debugging output, only.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 12:11:34 +0000 (12:11 +0000)]
helixish: railway_inplane_basis should not include a scale factor
Err, maybe it should ?
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 12:06:46 +0000 (12:06 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 30 Dec 2017 12:03:41 +0000 (12:03 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 23 Dec 2017 11:42:33 +0000 (11:42 +0000)]
helixish: debugging output, some bodges re color handling weirdness
It seems that ring() ignores the color if it is in kw, but not
if it is a separate parameter. WTF.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 23 Dec 2017 11:27:49 +0000 (11:27 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 17 Dec 2017 16:52:40 +0000 (16:52 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 17 Dec 2017 16:52:30 +0000 (16:52 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 17 Dec 2017 16:05:24 +0000 (16:05 +0000)]
visual: debug arrows better
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 17 Dec 2017 11:34:43 +0000 (11:34 +0000)]
helixish: bugfix
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 17 Dec 2017 11:34:37 +0000 (11:34 +0000)]
helixish: debugging output
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 17 Dec 2017 11:33:43 +0000 (11:33 +0000)]
visdebug: support caller-specified colour tuples
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 16 Dec 2017 14:46:41 +0000 (14:46 +0000)]
helixish: debugging
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sat, 16 Dec 2017 11:56:51 +0000 (11:56 +0000)]
helixish: debugging
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 13 Dec 2017 00:07:39 +0000 (00:07 +0000)]
more debugging
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 12 Dec 2017 21:38:34 +0000 (21:38 +0000)]
more debugging
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 12 Dec 2017 21:38:17 +0000 (21:38 +0000)]
move various np stuff into moenp
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Tue, 12 Dec 2017 21:00:45 +0000 (21:00 +0000)]
debugging arrangements for helixish
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 23:29:42 +0000 (23:29 +0000)]
helixish: well, it makes a brokenish thing
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 23:25:25 +0000 (23:25 +0000)]
findcurve handling: fflush stdout
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 23:25:13 +0000 (23:25 +0000)]
helixish: switch to siman
Still a bit wip
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 23:19:00 +0000 (23:19 +0000)]
findcurve output: Use >> and << for debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 23:18:28 +0000 (23:18 +0000)]
symbolic: make PARAM_NAMES ok to not use
siman findcurve does not use it right now
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 23:17:58 +0000 (23:17 +0000)]
findcurve output: tolerate "commentary"
GSL siman generates this
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 23:17:15 +0000 (23:17 +0000)]
findcurve execution: report end with [] rather than None
Will want this in a moment for siman, which more conveniently
prints lots of other guff from GSL.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 21:54:53 +0000 (21:54 +0000)]
helixish: more debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 21:37:37 +0000 (21:37 +0000)]
helixish: fix debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 21:32:06 +0000 (21:32 +0000)]
helixish: better debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 21:32:01 +0000 (21:32 +0000)]
helixish: fix global gamma
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 19:46:20 +0000 (19:46 +0000)]
helixish: better debug: show sh, th
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 19:45:25 +0000 (19:45 +0000)]
helixish: better debug: introduce dbg_fmt_params (nfc)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 19:40:55 +0000 (19:40 +0000)]
helixish: better debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 19:40:00 +0000 (19:40 +0000)]
helixish: fix tilt sense
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 19:39:54 +0000 (19:39 +0000)]
helixish: better debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 19:05:21 +0000 (19:05 +0000)]
helixish: fix augment augwith
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 17:51:15 +0000 (17:51 +0000)]
helixish: better debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 17:40:07 +0000 (17:40 +0000)]
helixish: fixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 17:40:01 +0000 (17:40 +0000)]
helixish: better debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Wed, 29 Nov 2017 17:23:14 +0000 (17:23 +0000)]
helixish: better debug
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 27 Nov 2017 12:44:40 +0000 (12:44 +0000)]
slight debug msg improvements
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 27 Nov 2017 12:40:46 +0000 (12:40 +0000)]
visdebug works now
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 27 Nov 2017 12:29:17 +0000 (12:29 +0000)]
vdbg infrastructure
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 27 Nov 2017 11:58:03 +0000 (11:58 +0000)]
python2 compat for helixish
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Mon, 27 Nov 2017 11:57:44 +0000 (11:57 +0000)]
helixish: bugfixes
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 26 Nov 2017 22:24:55 +0000 (22:24 +0000)]
helixish: Introduce matmultiply and augmatmultiply
uses matrix to do matrix multiply
bugfix
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Ian Jackson [Sun, 26 Nov 2017 22:11:23 +0000 (22:11 +0000)]
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.
Ian Jackson [Sun, 26 Nov 2017 22:09:00 +0000 (22:09 +0000)]
helixish: use @ for matrix multiplication
Older numpy wants you to use the matrix type. Newer Python and numpy
can use @.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>