mirror of
https://github.com/fjosw/pyerrors.git
synced 2025-03-15 06:40:24 +01:00
The conventions for the proper placement of binary operators with respect to line breaks seems to have changed from python 3.6.9 to 3.8.12...
This commit is contained in:
parent
e2565def8a
commit
0736a4e9f6
1 changed files with 4 additions and 4 deletions
|
@ -1149,8 +1149,8 @@ def covariance(obs1, obs2, correlation=False, **kwargs):
|
|||
"""
|
||||
|
||||
for name in sorted(set(obs1.names + obs2.names)):
|
||||
if ((obs1.shape.get(name) != obs2.shape.get(name)) and (obs1.shape.get(name) is not None) and (obs2.shape.get(name) is not None) or
|
||||
(1 != len(set([len(idx) for idx in [obs1.idl[name], obs2.idl[name], merge_idx([obs1.idl[name], obs2.idl[name]])]])))):
|
||||
if ((obs1.shape.get(name) != obs2.shape.get(name)) and (obs1.shape.get(name) is not None) and (obs2.shape.get(name) is not None)
|
||||
or (1 != len(set([len(idx) for idx in [obs1.idl[name], obs2.idl[name], merge_idx([obs1.idl[name], obs2.idl[name]])]])))):
|
||||
raise Exception('Shapes of ensemble', name, 'do not fit')
|
||||
|
||||
if not hasattr(obs1, 'e_names') or not hasattr(obs2, 'e_names'):
|
||||
|
@ -1328,8 +1328,8 @@ def covariance3(obs1, obs2, correlation=False, **kwargs):
|
|||
"""
|
||||
|
||||
for name in sorted(set(obs1.names + obs2.names)):
|
||||
if ((obs1.shape.get(name) != obs2.shape.get(name)) and (obs1.shape.get(name) is not None) and (obs2.shape.get(name) is not None) or
|
||||
(1 != len(set([len(idx) for idx in [obs1.idl[name], obs2.idl[name], merge_idx([obs1.idl[name], obs2.idl[name]])]])))):
|
||||
if ((obs1.shape.get(name) != obs2.shape.get(name)) and (obs1.shape.get(name) is not None) and (obs2.shape.get(name) is not None)
|
||||
or (1 != len(set([len(idx) for idx in [obs1.idl[name], obs2.idl[name], merge_idx([obs1.idl[name], obs2.idl[name]])]])))):
|
||||
raise Exception('Shapes of ensemble', name, 'do not fit')
|
||||
|
||||
if not hasattr(obs1, 'e_names') or not hasattr(obs2, 'e_names'):
|
||||
|
|
Loading…
Add table
Reference in a new issue