Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

ENH larry.merge() is now faster.

  • Loading branch information...
commit 56b9b470ef119d412248508d03f1a3e3184302d0 1 parent aa5e776
@kwgoodman authored
Showing with 1 addition and 2 deletions.
  1. +1 −1  la/deflarry.py
  2. +0 −1  la/flarry.py
View
2  la/deflarry.py
@@ -3294,7 +3294,7 @@ def merge(self, other, update=False):
lar2 = other
for ax in range(ndim):
if lar1.label[ax] != lar2.label[ax]:
- mergelabel = set(lar1.label[ax]) | set(lar2.label[ax])
+ mergelabel = set(lar1.label[ax] + lar2.label[ax])
mergelabel = sorted(mergelabel)
lar1 = lar1.morph(mergelabel, ax)
lar2 = lar2.morph(mergelabel, ax)
View
1  la/flarry.py
@@ -501,7 +501,6 @@ def align_axis(lars, axis=0, join='inner', flag=False):
elif join == 'right':
label = lars[-1].label[axis[-1]]
else:
- #labels = [set(lar.label[axis[j]]) for j, lar in enumerate(lars)]
label = frozenset(lars[0].label[axis[0]])
if join == 'inner':
for i, lar in enumerate(lars[1:]):
Please sign in to comment.
Something went wrong with that request. Please try again.