conversion to new python3
This commit is contained in:
@@ -168,7 +168,7 @@ class MeasurementResult(Drawable.Drawable, collections.UserDict):
|
||||
sorted array of all dictionary entries without Accumulated Value objects with n==0
|
||||
"""
|
||||
keys=numpy.array([k for k in list(self.data.keys()) if not (isinstance(self.data[k], AccumulatedValue) and self.data[k].n==0)],
|
||||
dtype="Float64")
|
||||
dtype="float64")
|
||||
keys.sort()
|
||||
return keys
|
||||
|
||||
@@ -177,18 +177,18 @@ class MeasurementResult(Drawable.Drawable, collections.UserDict):
|
||||
|
||||
def get_xydata(self):
|
||||
k=self.get_xdata()
|
||||
v=numpy.array([self.data[key].mean() for key in k], dtype="Float64")
|
||||
v=numpy.array([self.data[key].mean() for key in k], dtype="float64")
|
||||
return [k,v]
|
||||
|
||||
def get_errorplotdata(self):
|
||||
k=self.get_xdata()
|
||||
v=numpy.array([self.data[key].mean() for key in k], dtype="Float64")
|
||||
e=numpy.array([self.data[key].mean_error() for key in k], dtype="Float64")
|
||||
v=numpy.array([self.data[key].mean() for key in k], dtype="float64")
|
||||
e=numpy.array([self.data[key].mean_error() for key in k], dtype="float64")
|
||||
return [k,v,e]
|
||||
|
||||
def get_lineplotdata(self):
|
||||
k=self.get_xdata()
|
||||
v=numpy.array(self.y, dtype="Float64")
|
||||
v=numpy.array(self.y, dtype="float64")
|
||||
return [k, v]
|
||||
|
||||
def uses_statistics(self):
|
||||
|
||||
Reference in New Issue
Block a user