Skip to content

Commit 08b07c7

Browse files
committed
EHN: Refactor with black
1 parent 33d412f commit 08b07c7

File tree

6 files changed

+173
-82
lines changed

6 files changed

+173
-82
lines changed

labfis/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# Copyright © 2020 labfis.py
44
# (see LICENSE for details)
55

6-
__version__ = '1.2.0b1'
6+
__version__ = "1.2.0b1"
77

88
# Local imports
99
from labfis.uncertainty import labfloat, Infix
1010

11-
u = Infix(lambda x,y: labfloat(x,y))
11+
u = Infix(lambda x, y: labfloat(x, y))

labfis/test/accuracy_test.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,19 @@ def labfloat_iterative(vardic, exp):
1111
resulterror = 0
1212

1313
for var in vardic.keys():
14-
exec(var + "=" + 'vardic[var][0]')
14+
exec(var + "=" + "vardic[var][0]")
1515

1616
for var in vardic.keys():
1717
var_value = vardic[var][0]
1818
var_error = vardic[var][1]
1919

20-
exec(var + "=" + 'var_value' +
21-
"+" + 'dx')
20+
exec(var + "=" + "var_value" + "+" + "dx")
2221
dph = eval(exp)
2322

24-
exec(var + "=" + 'var_value')
23+
exec(var + "=" + "var_value")
2524
dpn = eval(exp)
2625

27-
derivative = (dph - dpn)/dx
26+
derivative = (dph - dpn) / dx
2827
resulterror += (derivative ** 2) * (var_error ** 2)
2928
return sqrt(resulterror)
3029

@@ -45,26 +44,26 @@ def labfloat_calc(vardic, exp):
4544
"b": (rng.random(), rng.random()),
4645
"c": (rng.random(), rng.random()),
4746
"d": (rng.random(), rng.random()),
48-
"e": (rng.random(), rng.random())
47+
"e": (rng.random(), rng.random()),
4948
}
5049

5150

5251
def test_labfloat_expressions():
5352
print(vals)
5453
var = list(vals.keys())
55-
opers = itertools.combinations_with_replacement(operations, len(var)-1)
54+
opers = itertools.combinations_with_replacement(operations, len(var) - 1)
5655
for exp in opers:
5756
expression = ""
5857
for i in range(len(exp)):
59-
if i == len(exp)-1:
60-
expression += var[i]+exp[i]+var[i+1]
58+
if i == len(exp) - 1:
59+
expression += var[i] + exp[i] + var[i + 1]
6160
else:
62-
expression += var[i]+exp[i]
61+
expression += var[i] + exp[i]
6362

6463
result1 = labfloat_iterative(vals, expression)
6564
result2 = labfloat_calc(vals, expression)
6665

67-
error = abs(result2 - result1)/result2
66+
error = abs(result2 - result1) / result2
6867

6968
print(expression)
7069
print(type(result1), type(result2))

labfis/test/arithmetic_test.py

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,21 @@
33

44

55
def test_zeros():
6-
zeros = [labfloat(), labfloat(0), labfloat(0.), labfloat(0, 0),
7-
labfloat(0., 0.), labfloat(0., 0), labfloat(0, 0.)]
6+
zeros = [
7+
labfloat(),
8+
labfloat(0),
9+
labfloat(0.0),
10+
labfloat(0, 0),
11+
labfloat(0.0, 0.0),
12+
labfloat(0.0, 0),
13+
labfloat(0, 0.0),
14+
]
815

916
for z1, z2 in combinations(zeros, 2):
1017
print(z1, z2)
1118
assert list(z1) == list(z2)
1219

20+
1321
def test_indexing():
1422
assert labfloat(10, 2)[:] == (10, 2)
1523

@@ -34,4 +42,5 @@ def test_neg_uncertainty():
3442

3543
assert list(x) == list(y)
3644

45+
3746
# TODO: test cases for other arithmetic operators

labfis/test/interface_test.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
from random import uniform
2-
from labfis import u, labfloat
2+
from labfis import u, labfloat
3+
34

45
def test_infix():
56
for _ in range(200):
6-
x, e = uniform(-2e50,2e50), uniform(-2e50,2e50)
7-
assert labfloat(x, e) == x |u| e == x <<u>> e
7+
x, e = uniform(-2e50, 2e50), uniform(-2e50, 2e50)
8+
assert labfloat(x, e) == x | u | e == x << u >> e
9+
810

911
def test_attrs():
1012
x = labfloat(10, 1)

0 commit comments

Comments
 (0)