Apple-2-Tools/atrcopy
1
0
Fork 0
mirror of https://github.com/robmcmullen/atrcopy.git synced 2024-05-31 18:41:29 +00:00
Code Issues Projects Releases Wiki Activity

Fixed segment rawdata copy for non-indexed segments

Browse Source
This commit is contained in:
Rob McMullen 2017-03-12 21:46:24 -07:00
parent bd4ff9569a
commit bdf0b67075
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atrcopy/segments.py
View File

@ -228,8 +228,8 @@ class SegmentData(object):
s = self.style.np_data.copy() s = self.style.np_data.copy()
copy = SegmentData(d, s, order=self.order) copy = SegmentData(d, s, order=self.order)
else: else:
d = self.data d = self.data.copy()
s = self.style s = self.style.copy()
start, end = self.byte_bounds_offset() start, end = self.byte_bounds_offset()
copy = SegmentData(d[start:end], s[start:end]) copy = SegmentData(d[start:end], s[start:end])
return copy return copy

21
test/test_segment.py
View File

@ -38,10 +38,17 @@ class TestSegment1(object):
def test_copy(self): def test_copy(self):
for s in self.segments: for s in self.segments:
c = s.rawdata.copy() d = s.rawdata
print c.data.shape, c.is_indexed print "orig:", d.data.shape, d.is_indexed, d.data, id(d.data)
print c.data.np_data, s.data.np_data c = d.copy()
assert np.all((c.data - s.data) == 0) print "copy", c.data.shape, c.is_indexed, c.data, id(c.data)
assert c.data.shape == s.data.shape
assert id(c) != id(s)
assert np.all((c.data[:] - s.data[:]) == 0)
c.data[0:100] = 1
print d.data
print c.data
assert not np.all((c.data[:] - s.data[:]) == 0)
class TestIndexed(object): class TestIndexed(object):
@ -180,7 +187,7 @@ if __name__ == "__main__":
t.test_indexed() t.test_indexed()
t.test_indexed_sub() t.test_indexed_sub()
t.test_interleave() t.test_interleave()
#t = TestSegment1() t = TestSegment1()
#t.setup() t.setup()
#t.test_xex() t.test_xex()
t.test_copy() t.test_copy()