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

fix: Another bug in range detection of obs._intersection_idx fixed.

Browse source
This commit is contained in:
Fabian Joswig 2022-04-28 14:07:42 +01:00
parent 99c98aeb9e
commit c7f17396e5
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pyerrors/obs.py
View file

@ -1,5 +1,7 @@
import warnings import warnings
import pickle import pickle
from math import gcd
from functools import reduce
import numpy as np import numpy as np
import autograd.numpy as anp # Thinly-wrapped numpy import autograd.numpy as anp # Thinly-wrapped numpy
from autograd import jacobian from autograd import jacobian
@ -981,6 +983,12 @@ def _intersection_idx(idl):
List of lists or ranges. List of lists or ranges.
""" """
def _lcm(*args):
"""Returns the lowest common multiple of args.
From python 3.9 onwards the math library contains an lcm function."""
return reduce(lambda a, b: a * b // gcd(a, b), args)
# Use groupby to efficiently check whether all elements of idl are identical # Use groupby to efficiently check whether all elements of idl are identical
try: try:
g = groupby(idl) g = groupby(idl)
@ -993,10 +1001,10 @@ def _intersection_idx(idl):
if len(set([idx[0] for idx in idl])) == 1: if len(set([idx[0] for idx in idl])) == 1:
idstart = max([idx.start for idx in idl]) idstart = max([idx.start for idx in idl])
idstop = min([idx.stop for idx in idl]) idstop = min([idx.stop for idx in idl])
idstep = max([idx.step for idx in idl]) idstep = _lcm(*[idx.step for idx in idl])
return range(idstart, idstop, idstep) return range(idstart, idstop, idstep)
return sorted(set.intersection(*[set(o) for o in tt])) return sorted(set.intersection(*[set(o) for o in idl]))
def _expand_deltas_for_merge(deltas, idx, shape, new_idx): def _expand_deltas_for_merge(deltas, idx, shape, new_idx):