mirror of
https://github.com/fjosw/pyerrors.git
synced 2025-03-15 23:00:25 +01:00
Added covobs to json file format
This commit is contained in:
parent
4454e3d82f
commit
b7bc508dcf
2 changed files with 60 additions and 2 deletions
|
@ -7,6 +7,7 @@ import datetime
|
||||||
import platform
|
import platform
|
||||||
import warnings
|
import warnings
|
||||||
from ..obs import Obs
|
from ..obs import Obs
|
||||||
|
from ..covobs import Covobs
|
||||||
from .. import version as pyerrorsversion
|
from .. import version as pyerrorsversion
|
||||||
|
|
||||||
|
|
||||||
|
@ -50,7 +51,7 @@ def create_json_string(ol, description='', indent=1):
|
||||||
|
|
||||||
def _gen_data_d_from_list(ol):
|
def _gen_data_d_from_list(ol):
|
||||||
dl = []
|
dl = []
|
||||||
for name in ol[0].e_names:
|
for name in ol[0].mc_names:
|
||||||
ed = {}
|
ed = {}
|
||||||
ed['id'] = name
|
ed['id'] = name
|
||||||
ed['replica'] = []
|
ed['replica'] = []
|
||||||
|
@ -69,6 +70,22 @@ def create_json_string(ol, description='', indent=1):
|
||||||
dl.append(ed)
|
dl.append(ed)
|
||||||
return dl
|
return dl
|
||||||
|
|
||||||
|
def _gen_cdata_d_from_list(ol):
|
||||||
|
dl = []
|
||||||
|
for name in ol[0].cov_names:
|
||||||
|
ed = {}
|
||||||
|
ed['id'] = name
|
||||||
|
ed['layout'] = str(ol[0].covobs[name].cov.shape).lstrip('(').rstrip(')').rstrip(',')
|
||||||
|
ed['cov'] = list(np.ravel(ol[0].covobs[name].cov))
|
||||||
|
ncov = ol[0].covobs[name].cov.shape[0]
|
||||||
|
ed['grad'] = []
|
||||||
|
for i in range(ncov):
|
||||||
|
ed['grad'].append([])
|
||||||
|
for o in ol:
|
||||||
|
ed['grad'][-1].append(o.covobs[name].grad[i][0])
|
||||||
|
dl.append(ed)
|
||||||
|
return dl
|
||||||
|
|
||||||
def _assert_equal_properties(ol, otype=Obs):
|
def _assert_equal_properties(ol, otype=Obs):
|
||||||
for o in ol:
|
for o in ol:
|
||||||
if not isinstance(o, otype):
|
if not isinstance(o, otype):
|
||||||
|
@ -93,6 +110,7 @@ def create_json_string(ol, description='', indent=1):
|
||||||
d['reweighted'] = o.reweighted
|
d['reweighted'] = o.reweighted
|
||||||
d['value'] = [o.value]
|
d['value'] = [o.value]
|
||||||
d['data'] = _gen_data_d_from_list([o])
|
d['data'] = _gen_data_d_from_list([o])
|
||||||
|
d['cdata'] = _gen_cdata_d_from_list([o])
|
||||||
return d
|
return d
|
||||||
|
|
||||||
def write_List_to_dict(ol):
|
def write_List_to_dict(ol):
|
||||||
|
@ -107,6 +125,7 @@ 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)
|
||||||
|
d['cdata'] = _gen_cdata_d_from_list(ol)
|
||||||
return d
|
return d
|
||||||
|
|
||||||
def write_Array_to_dict(oa):
|
def write_Array_to_dict(oa):
|
||||||
|
@ -122,6 +141,7 @@ 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)
|
||||||
|
d['cdata'] = _gen_cdata_d_from_list(ol)
|
||||||
return d
|
return d
|
||||||
|
|
||||||
if not isinstance(ol, list):
|
if not isinstance(ol, list):
|
||||||
|
@ -234,6 +254,22 @@ def import_json_string(json_string, verbose=True, full_output=False):
|
||||||
retd['is_merged'][rep['name']] = rep.get('is_merged', False)
|
retd['is_merged'][rep['name']] = rep.get('is_merged', False)
|
||||||
return retd
|
return retd
|
||||||
|
|
||||||
|
def _gen_covobsd_from_cdatad(d):
|
||||||
|
retd = {}
|
||||||
|
for ens in d:
|
||||||
|
retl = []
|
||||||
|
name = ens['id']
|
||||||
|
layouts = ens.get('layout', '1').strip()
|
||||||
|
layout = [int(ls.strip()) for ls in layouts.split(',') if len(ls) > 0]
|
||||||
|
cov = np.reshape(ens['cov'], layout)
|
||||||
|
grad = ens['grad']
|
||||||
|
nobs = len(grad[0])
|
||||||
|
print(nobs, grad)
|
||||||
|
for i in range(nobs):
|
||||||
|
retl.append({'name': name, 'cov': cov, 'grad': [g[i] for g in grad]})
|
||||||
|
retd[name] = retl
|
||||||
|
return retd
|
||||||
|
|
||||||
def get_Obs_from_dict(o):
|
def get_Obs_from_dict(o):
|
||||||
layouts = o.get('layout', '1').strip()
|
layouts = o.get('layout', '1').strip()
|
||||||
if layouts != '1':
|
if layouts != '1':
|
||||||
|
@ -241,8 +277,14 @@ def import_json_string(json_string, verbose=True, full_output=False):
|
||||||
|
|
||||||
values = o['value']
|
values = o['value']
|
||||||
od = _gen_obsd_from_datad(o['data'])
|
od = _gen_obsd_from_datad(o['data'])
|
||||||
|
cd = _gen_covobsd_from_cdatad(o['cdata'])
|
||||||
|
|
||||||
ret = Obs([[ddi[0] + values[0] for ddi in di] for di in od['deltas']], od['names'], idl=od['idl'])
|
ret = Obs([[ddi[0] + values[0] for ddi in di] for di in od['deltas']], od['names'], idl=od['idl'])
|
||||||
|
for name in cd:
|
||||||
|
co = cd[name][0]
|
||||||
|
ret._covobs[name] = Covobs(None, co['cov'], co['name'], grad=co['grad'])
|
||||||
|
ret.names.append(co['name'])
|
||||||
|
|
||||||
ret.reweighted = o.get('reweighted', False)
|
ret.reweighted = o.get('reweighted', False)
|
||||||
ret.is_merged = od['is_merged']
|
ret.is_merged = od['is_merged']
|
||||||
ret.tag = o.get('tag', [None])[0]
|
ret.tag = o.get('tag', [None])[0]
|
||||||
|
@ -253,11 +295,17 @@ def import_json_string(json_string, verbose=True, full_output=False):
|
||||||
layout = int(layouts)
|
layout = int(layouts)
|
||||||
values = o['value']
|
values = o['value']
|
||||||
od = _gen_obsd_from_datad(o['data'])
|
od = _gen_obsd_from_datad(o['data'])
|
||||||
|
cd = _gen_covobsd_from_cdatad(o['cdata'])
|
||||||
|
|
||||||
ret = []
|
ret = []
|
||||||
taglist = o.get('tag', layout * [None])
|
taglist = o.get('tag', layout * [None])
|
||||||
for i in range(layout):
|
for i in range(layout):
|
||||||
ret.append(Obs([list(di[:, i] + values[i]) for di in od['deltas']], od['names'], idl=od['idl']))
|
ret.append(Obs([list(di[:, i] + values[i]) for di in od['deltas']], od['names'], idl=od['idl']))
|
||||||
|
for name in cd:
|
||||||
|
co = cd[name][i]
|
||||||
|
ret[-1]._covobs[name] = Covobs(None, co['cov'], co['name'], grad=co['grad'])
|
||||||
|
ret[-1].names.append(co['name'])
|
||||||
|
|
||||||
ret[-1].reweighted = o.get('reweighted', False)
|
ret[-1].reweighted = o.get('reweighted', False)
|
||||||
ret[-1].is_merged = od['is_merged']
|
ret[-1].is_merged = od['is_merged']
|
||||||
ret[-1].tag = taglist[i]
|
ret[-1].tag = taglist[i]
|
||||||
|
@ -269,11 +317,16 @@ def import_json_string(json_string, verbose=True, full_output=False):
|
||||||
N = np.prod(layout)
|
N = np.prod(layout)
|
||||||
values = o['value']
|
values = o['value']
|
||||||
od = _gen_obsd_from_datad(o['data'])
|
od = _gen_obsd_from_datad(o['data'])
|
||||||
|
cd = _gen_covobsd_from_cdatad(o['cdata'])
|
||||||
|
|
||||||
ret = []
|
ret = []
|
||||||
taglist = o.get('tag', N * [None])
|
taglist = o.get('tag', N * [None])
|
||||||
for i in range(N):
|
for i in range(N):
|
||||||
ret.append(Obs([di[:, i] + values[i] for di in od['deltas']], od['names'], idl=od['idl']))
|
ret.append(Obs([di[:, i] + values[i] for di in od['deltas']], od['names'], idl=od['idl']))
|
||||||
|
for name in cd:
|
||||||
|
co = cd[name][i]
|
||||||
|
ret[-1]._covobs[name] = Covobs(None, co['cov'], co['name'], grad=co['grad'])
|
||||||
|
ret[-1].names.append(co['name'])
|
||||||
ret[-1].reweighted = o.get('reweighted', False)
|
ret[-1].reweighted = o.get('reweighted', False)
|
||||||
ret[-1].is_merged = od['is_merged']
|
ret[-1].is_merged = od['is_merged']
|
||||||
ret[-1].tag = taglist[i]
|
ret[-1].tag = taglist[i]
|
||||||
|
|
|
@ -13,9 +13,14 @@ def test_jsonio():
|
||||||
otag = 'This has been merged!'
|
otag = 'This has been merged!'
|
||||||
o4.tag = otag
|
o4.tag = otag
|
||||||
do = o - .2 * o4
|
do = o - .2 * o4
|
||||||
|
co1 = pe.cov_Obs(1., .123, 'cov1')
|
||||||
|
do *= co1
|
||||||
do.tag = {'A': 2}
|
do.tag = {'A': 2}
|
||||||
|
|
||||||
o5 = pe.pseudo_Obs(0.8, .1, 'two|r2')
|
o5 = pe.pseudo_Obs(0.8, .1, 'two|r2')
|
||||||
|
co2 = pe.cov_Obs([1, 2], [[.12, .004], [.004, .02]], 'cov2')
|
||||||
|
o5 /= co2[0]
|
||||||
|
o3 /= co2[1]
|
||||||
o5.tag = 2 * otag
|
o5.tag = 2 * otag
|
||||||
testl = [o3, o5]
|
testl = [o3, o5]
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue