hiro/hopsflow
1
0
Fork 0
mirror of https://github.com/vale981/hopsflow synced 2025-03-04 16:31:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow summing ensemble values with different sample counts

Browse source
This commit is contained in:
Valentin Boettcher 2022-06-09 16:12:59 +02:00
parent 080a11d19e
commit 0bdbcba4c8
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
hopsflow/util.py
View file

@ -153,14 +153,24 @@ class EnsembleValue:
out = []
for left_i, right_i in zip(left, right):
if left_i[0] != right_i[0]:
raise RuntimeError("Can only add equal sample counts.")
if left_i[0] < right_i[0]:
samples = left_i[0]
σ = np.sqrt(
left_i[2] ** 2
+ right_i[2] ** 2 * (right_i[0] - 1) / (left_i[0] - 1)
).real
else:
samples = right_i[0]
σ = np.sqrt(
left_i[2] ** 2 * (left_i[0] - 1) / (right_i[0] - 1)
+ right_i[2] ** 2
).real
out.append(
(
left_i[0],
samples,
left_i[1] + right_i[1],
np.sqrt(left_i[2] ** 2 + right_i[2] ** 2).real,
σ,
)
)
@ -535,7 +545,7 @@ def integrate_array(
if err is not None:
dt = t[1:] - t[:-1]
err_sum = [
np.concatenate(([0], np.cumsum(((e[1:] ** 2 + e[:-1] ** 2) / 4) * dt**2)))
np.concatenate(([0], np.cumsum(((e[1:] ** 2 + e[:-1] ** 2) / 4) * dt ** 2)))
for e in err
]
err_integral = np.sqrt(err_sum).real