Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/djcdata/SimpleArray.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ def createFromNumpy(self, nparr, nprs=np.array([],dtype='int64')):
name = self.name()
fnames = self.featureNames()
self._setDtype(str(nparr.dtype))
if nprs.dtype == 'int32':
self.sa.createFromNumpy(nparr, nprs.as_type('int64'))
if nprs.dtype == np.dtype('int32'):
self.sa.createFromNumpy(nparr, nprs.astype('int64'))
else:
self.sa.createFromNumpy(nparr, nprs)
self.sa.createFromNumpy(nparr, nprs)
self.setName(name)
self.setFeatureNames(fnames)

Expand Down
23 changes: 19 additions & 4 deletions test/TestSimpleArray.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,33 @@ def test_transferToNumpyInt(self):

def test_createFromNumpyInt(self):
print('TestSimpleArray: createFromNumpyInt')

arr,rs = self.createNumpy('int32')

a = SimpleArray(dtype='int32')
a.createFromNumpy(arr,rs)

narr, nrs = a.copyToNumpy()
nrs=nrs[:,0]

diff = np.max(np.abs(narr-arr))
diff += np.max(np.abs(nrs-rs))
self.assertTrue(diff< 0.000001)

def test_createFromNumpy_rowsplits_int32(self):
print('TestSimpleArray: createFromNumpy_rowsplits_int32')
arr = np.array(np.random.rand(500,3,5,6)*100., dtype='float32')
rs = np.array([0,100,230,500], dtype='int32')

a = SimpleArray(dtype='float32')
a.createFromNumpy(arr,rs)

narr, nrs = a.copyToNumpy()
nrs = nrs[:,0]

diff = np.max(np.abs(narr-arr))
diff += np.max(np.abs(nrs-rs.astype('int64')))
self.assertTrue(diff< 0.000001)

def test_dynamicTypeChange(self):
print('TestSimpleArray: dynamicTypeChange')
Expand Down