223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

not needed for integer arrays

This commit is contained in:
Martin Diehl 2020-01-15 13:45:05 +01:00
parent e2802ca640
commit ce47e18e5c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/damask/table.py
View File

@ -48,7 +48,7 @@ class Table():
def __add_comment(self,label,shape,info): def __add_comment(self,label,shape,info):
if info is not None: if info is not None:
self.comments.append('{}{}: {}'.format(label, self.comments.append('{}{}: {}'.format(label,
' '+str(shape) if np.prod(shape,dtype=int) > 1 else '', ' '+str(shape) if np.prod(shape) > 1 else '',
info)) info))
@ -208,7 +208,7 @@ class Table():
self.__add_comment(label,data.shape[1:],info) self.__add_comment(label,data.shape[1:],info)
self.shapes[label] = data.shape[1:] if len(data.shape) > 1 else (1,) self.shapes[label] = data.shape[1:] if len(data.shape) > 1 else (1,)
size = np.prod(data.shape[1:],dtype=int) size = np.prod(data.shape[1:])
new = pd.DataFrame(data=data.reshape(-1,size), new = pd.DataFrame(data=data.reshape(-1,size),
columns=[label]*size, columns=[label]*size,
) )
@ -329,7 +329,7 @@ class Table():
for i in range(self.shapes[l][0])] for i in range(self.shapes[l][0])]
else: else:
labels += ['{}:{}_{}'.format('x'.join([str(d) for d in self.shapes[l]]),i+1,l) \ labels += ['{}:{}_{}'.format('x'.join([str(d) for d in self.shapes[l]]),i+1,l) \
for i in range(np.prod(self.shapes[l],dtype=int))] for i in range(np.prod(self.shapes[l]))]
header = ['{} header'.format(len(self.comments)+1)] \ header = ['{} header'.format(len(self.comments)+1)] \
+ self.comments \ + self.comments \