lattice/pyerrors
1
0
Fork 0
mirror of https://github.com/fjosw/pyerrors.git synced 2025-05-14 11:33:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

repr and print of correlator class altered

Browse source
This commit is contained in:
Fabian Joswig 2021-09-27 16:39:33 +01:00
parent 12469e304b
commit 7886201983
2 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

26
pyerrors/correlators.py
View file

@ -342,11 +342,25 @@ class Corr:
dump_object(self,filename) dump_object(self,filename)
return return
def print(self, range=[0, None]):
print(self.__repr__(range))
def __repr__(self): def __repr__(self, range=[0, None]):
return("Corr[T="+str(self.T)+" , N="+str(self.N)+" , content="+str(self.content)+"]") if range[1]:
range[1] += 1
content_string = 'x0/a\tCorr(x0/a)\n------------------\n'
for i, sub_corr in enumerate(self.content[range[0]:range[1]]):
if sub_corr is None:
content_string += str(i + range[0]) + '\n'
else:
content_string += str(i + range[0])
for element in sub_corr:
content_string += '\t' + element.__repr__()[4:-1]
content_string += '\n'
return content_string
def __str__(self): def __str__(self):
return ("Corr[T="+str(self.T)+" , N="+str(self.N)+" , content="+str(self.content)+"]") return self.__repr__()
#return ("Corr[T="+str(self.T)+" , N="+str(self.N)+" , content="+str([o[0] for o in [o for o in self.content]])+"]")
#We define the basic operations, that can be performed with correlators. #We define the basic operations, that can be performed with correlators.
#While */+- get defined here, they only work for Corr*Obs and not Obs*Corr. #While */+- get defined here, they only work for Corr*Obs and not Obs*Corr.
@ -462,7 +476,11 @@ class Corr:
else: else:
raise TypeError("type of exponent not supported") raise TypeError("type of exponent not supported")
#The numpy functions: def __abs__(self):
newcontent=[None if (item is None) else np.abs(item) for item in self.content]
return Corr(newcontent)
#The numpy functions:
def sqrt(self): def sqrt(self):
return self**0.5 return self**0.5

4
pyerrors/pyerrors.py
View file

@ -555,8 +555,8 @@ class Obs:
return np.array([self / o for o in y]) return np.array([self / o for o in y])
elif(y.__class__.__name__=="Corr"): elif(y.__class__.__name__=="Corr"):
return NotImplemented return NotImplemented
else: else:
return derived_observable(lambda x, **kwargs: x[0] / y, [self], man_grad=[1 / y]) return derived_observable(lambda x, **kwargs: x[0] / y, [self], man_grad=[1 / y])