mirror-github-bspeice/cuburn
1
0
Fork 0
mirror of https://github.com/stevenrobertson/cuburn.git synced 2025-11-03 18:00:55 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some annoying but trivial whitespace issues

Browse Source
This commit is contained in:
Steven Robertson
2011-12-18 21:53:26 -05:00
parent 60e7eb120e
commit 9972d48ba0
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cuburn/genome.py
View File

@ -207,11 +207,16 @@ class Genome(_AttrDict):
times = times + 0.5 * err * (np.tanh(epts) + 1) times = times + 0.5 * err * (np.tanh(epts) + 1)
return err, times return err, times
def json_encode_genome(obj, indent=0): def json_encode_genome(obj):
""" """
Encode an object into JSON notation. This serializer only works on the Encode an object into JSON notation. This serializer only works on the
subset of JSON used in genomes. subset of JSON used in genomes.
""" """
result = _js_enc_obj(obj).lstrip()
result = '\n'.join(l.rstrip() for l in result.split('\n'))
return result + '\n'
def _js_enc_obj(obj, indent=0):
# TODO: test, like so many other things # TODO: test, like so many other things
isnum = lambda v: isinstance(v, (float, int, np.number)) isnum = lambda v: isinstance(v, (float, int, np.number))
@ -232,15 +237,15 @@ def json_encode_genome(obj, indent=0):
if ks == ('b', 'g', 'r'): if ks == ('b', 'g', 'r'):
ks, vs = reversed(ks), reversed(vs) ks, vs = reversed(ks), reversed(vs)
ks = [crep('%.8g' % k if isnum(k) else str(k)) for k in ks] ks = [crep('%.8g' % k if isnum(k) else str(k)) for k in ks]
vs = [json_encode_genome(v, indent+2) for v in vs] vs = [_js_enc_obj(v, indent+2) for v in vs]
return wrap(['%s: %s' % p for p in zip(ks, vs)], '{}') return wrap(['%s: %s' % p for p in zip(ks, vs)], '{}')
elif isinstance(obj, list): elif isinstance(obj, list):
vs = [json_encode_genome(v, indent+2) for v in obj] vs = [_js_enc_obj(v, indent+2) for v in obj]
if vs and len(vs) % 2 == 0 and isnum(obj[0]): if vs and len(vs) % 2 == 0 and isnum(obj[0]):
vs = map(', '.join, zip(vs[::2], vs[1::2])) vs = map(', '.join, zip(vs[::2], vs[1::2]))
return wrap(vs, '[]') return wrap(vs, '[]')
elif isinstance(obj, SplEval): elif isinstance(obj, SplEval):
return json_encode_genome(obj.knotlist, indent) return _js_enc_obj(obj.knotlist, indent)
elif isinstance(obj, basestring): elif isinstance(obj, basestring):
return crep(obj) return crep(obj)
elif isnum(obj): elif isnum(obj):