From: Ian Jackson Date: Sun, 26 Nov 2017 16:27:37 +0000 (+0000) Subject: introduce dbg_file X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=d2e31fe33c5e0bb9516ca5e6f0be44e8644e36f3;p=moebius3.git introduce dbg_file Signed-off-by: Ian Jackson --- diff --git a/gensymbolic b/gensymbolic index e0f08ee..0ab8269 100755 --- a/gensymbolic +++ b/gensymbolic @@ -6,7 +6,7 @@ from optparse import OptionParser import sympy import symbolic -from moedebug import dbg_enable, dbg +from moedebug import dbg_file, dbg opt_parser = OptionParser() opt_parser.add_option('-q',dest='quiet',action='store_true', @@ -21,8 +21,8 @@ assert(not len(args)) if (not options.ascii) and sys.stdout.encoding is None: sys.stdout = codecs.open("/dev/stdout", "w", 'utf-8') -dbg_enable = not options.quiet -if dbg_enable: +dbg_file = None if options.quiet else sys.stdout +if dbg_file: sympy.init_printing(use_unicode=(not options.ascii), num_columns=options.width) diff --git a/moedebug.py b/moedebug.py index b77d8cf..ac9caeb 100644 --- a/moedebug.py +++ b/moedebug.py @@ -1,7 +1,7 @@ -dbg_enable = False +dbg_file = None def dbg(*args): - if dbg_enable: - print('D ', *args, file=sys.stderr) + if dbg_file: + print('D ', *args, file=dbg_file) diff --git a/symbolic.py b/symbolic.py index 2f3f8e6..0f2ff03 100644 --- a/symbolic.py +++ b/symbolic.py @@ -2,7 +2,7 @@ from sympy import * import itertools -from moedebug import dbg_enable +from moedebug import dbg_file from sympy.utilities.lambdify import lambdify, implemented_function @@ -12,11 +12,11 @@ r, theta, s, la, mu, kappa = symbols('r theta s lambda mu kappa') # rightvars replaces def dprint(*args): - if not dbg_enable: return + if not dbg_file: return print(*args) def dbg(*args): - if not dbg_enable: return + if not dbg_file: return for vn in args: print('\n ' + vn + '\n') pprint(eval(vn))