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

Workaround implemented to deal with matrix operations containing floats

Browse source 
or integers
This commit is contained in:
Fabian Joswig 2021-10-17 12:23:27 +01:00
parent aa4c037e39
commit 573d4992c9
1 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

14
pyerrors/pyerrors.py
View file

@ -517,9 +517,10 @@ class Obs:
else: else:
if isinstance(y, np.ndarray): if isinstance(y, np.ndarray):
return np.array([self * o for o in y]) return np.array([self * o for o in y])
elif isinstance(y, complex):
return CObs(self * y.real, self * y.imag)
elif y.__class__.__name__ == 'Corr': elif y.__class__.__name__ == 'Corr':
return NotImplemented return NotImplemented
else: else:
return derived_observable(lambda x, **kwargs: x[0] * y, [self], man_grad=[y]) return derived_observable(lambda x, **kwargs: x[0] * y, [self], man_grad=[y])
@ -729,6 +730,17 @@ def derived_observable(func, data, **kwargs):
data = np.asarray(data) data = np.asarray(data)
raveled_data = data.ravel() raveled_data = data.ravel()
# Workaround for matrix operations containing non Obs data
for i_data in raveled_data:
if isinstance(i_data, Obs):
first_name = i_data.names[0]
first_shape = i_data.shape[first_name]
break
for i in range(len(raveled_data)):
if isinstance(raveled_data[i], (int, float)):
raveled_data[i] = Obs([raveled_data[i] + np.zeros(first_shape)], [first_name])
n_obs = len(raveled_data) n_obs = len(raveled_data)
new_names = sorted(set([y for x in [o.names for o in raveled_data] for y in x])) new_names = sorted(set([y for x in [o.names for o in raveled_data] for y in x]))
replicas = len(new_names) replicas = len(new_names)