lattice/pyerrors
1
0
Fork 0
mirror of https://github.com/fjosw/pyerrors.git synced 2025-05-16 12:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor: formatting improvements

Browse source
This commit is contained in:
Fabian Joswig 2021-12-02 11:32:28 +00:00
parent a67e83f77b
commit d837e47777
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pyerrors/input/json.py
View file

@ -33,7 +33,7 @@ def create_json_string(ol, description='', indent=1):
_default.default = json.JSONEncoder().default _default.default = json.JSONEncoder().default
my_encoder.default = _default my_encoder.default = _default
class deltalist: class Deltalist:
def __init__(self, li): def __init__(self, li):
self.cnfg = li[0] self.cnfg = li[0]
self.deltas = li[1:] self.deltas = li[1:]
@ -64,7 +64,7 @@ def create_json_string(ol, description='', indent=1):
rd['deltas'].append([ol[0].idl[r_name][i]]) rd['deltas'].append([ol[0].idl[r_name][i]])
for o in ol: for o in ol:
rd['deltas'][-1].append(o.deltas[r_name][i]) rd['deltas'][-1].append(o.deltas[r_name][i])
rd['deltas'][-1] = deltalist(rd['deltas'][-1]) rd['deltas'][-1] = Deltalist(rd['deltas'][-1])
ed['replica'].append(rd) ed['replica'].append(rd)
dl.append(ed) dl.append(ed)
return dl return dl
@ -82,7 +82,6 @@ def create_json_string(ol, description='', indent=1):
raise Exception("All Obs in list have to be defined on the same set of configs.") raise Exception("All Obs in list have to be defined on the same set of configs.")
if not ol[0].idl == o.idl: if not ol[0].idl == o.idl:
raise Exception("All Obs in list have to be defined on the same set of configurations.") raise Exception("All Obs in list have to be defined on the same set of configurations.")
# TODO: more stringend tests --> compare idl?
def write_Obs_to_dict(o): def write_Obs_to_dict(o):
d = {} d = {}
@ -108,7 +107,6 @@ def create_json_string(ol, description='', indent=1):
d['reweighted'] = ol[0].reweighted d['reweighted'] = ol[0].reweighted
d['value'] = [o.value for o in ol] d['value'] = [o.value for o in ol]
d['data'] = _gen_data_d_from_list(ol) d['data'] = _gen_data_d_from_list(ol)
return d return d
def write_Array_to_dict(oa): def write_Array_to_dict(oa):
@ -128,6 +126,7 @@ def create_json_string(ol, description='', indent=1):
if not isinstance(ol, list): if not isinstance(ol, list):
ol = [ol] ol = [ol]
d = {} d = {}
d['program'] = 'pyerrors %s' % (pyerrorsversion.__version__) d['program'] = 'pyerrors %s' % (pyerrorsversion.__version__)
d['version'] = '0.1' d['version'] = '0.1'
@ -148,9 +147,10 @@ def create_json_string(ol, description='', indent=1):
jsonstring = json.dumps(d, indent=indent, cls=my_encoder, ensure_ascii=False) jsonstring = json.dumps(d, indent=indent, cls=my_encoder, ensure_ascii=False)
# workaround for un-quoting of delta lists, adds 5% of work
# but is save, compared to a simple replace that could destroy the structure
def remove_quotationmarks(s): def remove_quotationmarks(s):
"""Workaround for un-quoting of delta lists, adds 5% of work
but is save, compared to a simple replace that could destroy the structure
"""
deltas = False deltas = False
split = s.split('\n') split = s.split('\n')
for i in range(len(split)): for i in range(len(split)):
@ -205,6 +205,7 @@ def dump_to_json(ol, fname, description='', indent=1, gz=True):
def load_json(fname, verbose=True, gz=True, full_output=False): def load_json(fname, verbose=True, gz=True, full_output=False):
"""Import a list of Obs or structures containing Obs from a .json.gz file. """Import a list of Obs or structures containing Obs from a .json.gz file.
The following structures are supported: Obs, list, numpy.ndarray The following structures are supported: Obs, list, numpy.ndarray
If the list contains only one element, it is unpacked from the list. If the list contains only one element, it is unpacked from the list.