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

fixed malfunctioning table.label_indexrange(listOfLabels). can now be used as numpy slice.

This commit is contained in:
Philip Eisenlohr 2016-04-24 10:07:37 -05:00
parent 648c2dd1d3
commit 45e237058b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/damask/asciitable.py
View File

@ -67,7 +67,7 @@ class ASCIItable():
return 0.0 return 0.0
# ------------------------------------------------------------------ # ------------------------------------------------------------------
def _noCRLF(self, def _removeCRLF(self,
string): string):
try: try:
return string.replace('\n','').replace('\r','') return string.replace('\n','').replace('\r','')
@ -251,9 +251,9 @@ class ASCIItable():
try: try:
for item in what: self.labels_append(item) for item in what: self.labels_append(item)
except: except:
self.labels += [self._noCRLF(str(what))] self.labels += [self._removeCRLF(str(what))]
else: else:
self.labels += [self._noCRLF(what)] self.labels += [self._removeCRLF(what)]
self.__IO__['labeled'] = True # switch on processing (in particular writing) of labels self.__IO__['labeled'] = True # switch on processing (in particular writing) of labels
if reset: self.__IO__['labels'] = list(self.labels) # subsequent data_read uses current labels as data size if reset: self.__IO__['labels'] = list(self.labels) # subsequent data_read uses current labels as data size
@ -369,8 +369,9 @@ class ASCIItable():
start = self.label_index(labels) start = self.label_index(labels)
dim = self.label_dimension(labels) dim = self.label_dimension(labels)
return map(lambda a,b: xrange(a,a+b), zip(start,dim)) if isinstance(labels, Iterable) and not isinstance(labels, str) \ return np.hstack(map(lambda c: xrange(c[0],c[0]+c[1]), zip(start,dim))) \
else xrange(start,start+dim) if isinstance(labels, Iterable) and not isinstance(labels, str) \
else xrange(start,start+dim)
# ------------------------------------------------------------------ # ------------------------------------------------------------------
def info_append(self, def info_append(self,
@ -380,9 +381,9 @@ class ASCIItable():
try: try:
for item in what: self.info_append(item) for item in what: self.info_append(item)
except: except:
self.info += [self._noCRLF(str(what))] self.info += [self._removeCRLF(str(what))]
else: else:
self.info += [self._noCRLF(what)] self.info += [self._removeCRLF(what)]
# ------------------------------------------------------------------ # ------------------------------------------------------------------
def info_clear(self): def info_clear(self):