mirror of
https://github.com/fjosw/pyerrors.git
synced 2025-05-14 19:43:41 +02:00
Merge branch 'develop' into documentation
This commit is contained in:
commit
813d384bd1
3 changed files with 9 additions and 3 deletions
|
@ -699,8 +699,6 @@ class Obs:
|
|||
return 'Obs[' + str(self) + ']'
|
||||
|
||||
def __str__(self):
|
||||
if self._dvalue == 0.0:
|
||||
return str(self.value)
|
||||
return _format_uncertainty(self.value, self._dvalue)
|
||||
|
||||
def __hash__(self):
|
||||
|
@ -979,6 +977,8 @@ class CObs:
|
|||
|
||||
def _format_uncertainty(value, dvalue):
|
||||
"""Creates a string of a value and its error in paranthesis notation, e.g., 13.02(45)"""
|
||||
if dvalue == 0.0:
|
||||
return str(value)
|
||||
fexp = np.floor(np.log10(dvalue))
|
||||
if fexp < 0.0:
|
||||
return '{:{form}}({:2.0f})'.format(value, dvalue * 10 ** (-fexp + 1), form='.' + str(-int(fexp) + 1) + 'f')
|
||||
|
|
2
setup.py
2
setup.py
|
@ -11,7 +11,7 @@ with open(convert_path('pyerrors/version.py')) as ver_file:
|
|||
|
||||
setup(name='pyerrors',
|
||||
version=version['__version__'],
|
||||
description='Statistical error analysis for Monte Carlo simulations',
|
||||
description='Error propagation and statistical analysis for Monte Carlo simulations',
|
||||
long_description=long_description,
|
||||
long_description_content_type='text/markdown',
|
||||
url="https://github.com/fjosw/pyerrors",
|
||||
|
|
|
@ -998,6 +998,12 @@ def test_cobs_array():
|
|||
cobs / np.ones((4, 4))
|
||||
|
||||
|
||||
def test_details_tau_no_error():
|
||||
tt = pe.Obs([np.random.rand(500)], ["ens"])
|
||||
tt.gamma_method(S=0)
|
||||
tt.details()
|
||||
|
||||
|
||||
def test_hash():
|
||||
obs = pe.pseudo_Obs(0.3, 0.1, "test") + pe.Obs([np.random.normal(2.3, 0.2, 200)], ["test2"], [range(1, 400, 2)])
|
||||
o1 = obs + pe.cov_Obs(0.0, 0.1, "co") + pe.cov_Obs(0.0, 0.8, "co2")
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue