Merge branch 'develop' into documentation

This commit is contained in:
fjosw 2021-12-10 16:32:29 +00:00
commit ee003cfd87

View file

@ -68,7 +68,7 @@ class Obs:
already subtracted from the samples already subtracted from the samples
""" """
if means is None and samples is not None: if means is None and len(samples):
if len(samples) != len(names): if len(samples) != len(names):
raise Exception('Length of samples and names incompatible.') raise Exception('Length of samples and names incompatible.')
if idl is not None: if idl is not None:
@ -86,11 +86,7 @@ class Obs:
if min(len(x) for x in samples) <= 4: if min(len(x) for x in samples) <= 4:
raise Exception('Samples have to have at least 5 entries.') raise Exception('Samples have to have at least 5 entries.')
if names:
self.names = sorted(names) self.names = sorted(names)
else:
self.names = []
self.shape = {} self.shape = {}
self.r_values = {} self.r_values = {}
self.deltas = {} self.deltas = {}
@ -100,7 +96,7 @@ class Obs:
self.covobs = covobs self.covobs = covobs
self.idl = {} self.idl = {}
if samples is not None: if len(samples):
if idl is not None: if idl is not None:
for name, idx in sorted(zip(names, idl)): for name, idx in sorted(zip(names, idl)):
if isinstance(idx, range): if isinstance(idx, range):
@ -1632,7 +1628,7 @@ def cov_Obs(means, cov, name, grad=None):
co : Covobs co : Covobs
Covobs to be embedded into the Obs Covobs to be embedded into the Obs
""" """
o = Obs(None, None) o = Obs([], [])
o._value = co.value o._value = co.value
o.names.append(co.name) o.names.append(co.name)
o.covobs[co.name] = co o.covobs[co.name] = co