Skip to content

Commit a0e5fa5

Browse files
sbillingesbillinge
authored
Merge pull request #74 from bobleesj/cookie-flake8
Fix flake8 error of ambiguous name (E741)
2 parents 6be7651 + ad545e4 commit a0e5fa5

File tree

6 files changed

+70
-71
lines changed

6 files changed

+70
-71
lines changed

‎src/diffpy/srfit/equation/builder.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,7 @@ def registerFunction(self, name, func, argnames):
213213
opbuilder = wrapFunction(name, func, len(argnames))
214214
for n in argnames:
215215
b = self.builders[n]
216-
l = b.literal
217-
opbuilder.literal.addLiteral(l)
216+
opbuilder.literal.addLiteral(b.literal)
218217

219218
return self.registerBuilder(name, opbuilder)
220219

‎src/diffpy/srfit/fitbase/fitresults.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ def _calculateCovariance(self):
173173
self.cov = numpy.dot(vh.T.conj() / s**2, vh)
174174
except numpy.linalg.LinAlgError:
175175
self.messages.append("Cannot compute covariance matrix.")
176-
l = len(self.varvals)
177-
self.cov = numpy.zeros((l, l), dtype=float)
176+
matrix_size = len(self.varvals)
177+
self.cov = numpy.zeros((matrix_size, matrix_size), dtype=float)
178178
return
179179

180180
def _calculateJacobian(self):
@@ -325,17 +325,17 @@ def formatResults(self, header="", footer="", update=False):
325325
lines.append(header)
326326

327327
if not certain:
328-
l = "Some quantities invalid due to missing profile uncertainty"
329-
if not l in self.messages:
330-
self.messages.append(l)
328+
error_message = "Some quantities invalid due to missing profile uncertainty"
329+
if not error_message in self.messages:
330+
self.messages.append(error_message)
331331

332332
lines.extend(self.messages)
333333

334334
## Overall results
335-
l = "Overall"
335+
error_message = "Overall"
336336
if not certain:
337-
l += " (Chi2 and Reduced Chi2 invalid)"
338-
lines.append(l)
337+
error_message += " (Chi2 and Reduced Chi2 invalid)"
338+
lines.append(error_message)
339339
lines.append(_DASHEDLINE)
340340
formatstr = "%-14s %.8f"
341341
lines.append(formatstr % ("Residual", self.residual))
@@ -351,10 +351,10 @@ def formatResults(self, header="", footer="", update=False):
351351
keys.sort(key=numstr)
352352

353353
lines.append("")
354-
l = "Contributions"
354+
error_message = "Contributions"
355355
if not certain:
356-
l += " (Chi2 and Reduced Chi2 invalid)"
357-
lines.append(l)
356+
error_message += " (Chi2 and Reduced Chi2 invalid)"
357+
lines.append(error_message)
358358
lines.append(_DASHEDLINE)
359359
formatstr = "%-10s %-42.8f"
360360
for name in keys:
@@ -370,11 +370,11 @@ def formatResults(self, header="", footer="", update=False):
370370
## The variables
371371
if self.varnames:
372372
lines.append("")
373-
l = "Variables"
373+
error_message = "Variables"
374374
if not certain:
375375
m = "Uncertainties invalid"
376-
l += " (%s)" % m
377-
lines.append(l)
376+
error_message += " (%s)" % m
377+
lines.append(error_message)
378378
lines.append(_DASHEDLINE)
379379

380380
varnames = self.varnames
@@ -409,10 +409,10 @@ def formatResults(self, header="", footer="", update=False):
409409
## The constraints
410410
if self.connames and self.showcon:
411411
lines.append("")
412-
l = "Constrained Parameters"
412+
error_message = "Constrained Parameters"
413413
if not certain:
414-
l += " (Uncertainties invalid)"
415-
lines.append(l)
414+
error_message += " (Uncertainties invalid)"
415+
lines.append(error_message)
416416
lines.append(_DASHEDLINE)
417417

418418
w = 0
@@ -438,10 +438,10 @@ def formatResults(self, header="", footer="", update=False):
438438
## Variable correlations
439439
lines.append("")
440440
corint = int(corrmin * 100)
441-
l = "Variable Correlations greater than %i%%" % corint
441+
error_message = "Variable Correlations greater than %i%%" % corint
442442
if not certain:
443-
l += " (Correlations invalid)"
444-
lines.append(l)
443+
error_message += " (Correlations invalid)"
444+
lines.append(error_message)
445445
lines.append(_DASHEDLINE)
446446
tup = []
447447
cornames = []

‎src/diffpy/srfit/sas/prcalculator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ def __call__(self, r):
9292
self._invertor.y = iq
9393
self._invertor.err = diq
9494
c, c_cov = self._invertor.invert_optimize()
95-
l = lambda x: self._invertor.pr(c, x)
96-
pr = map(l, r)
95+
calculate_pr = lambda x: self._invertor.pr(c, x)
96+
pr = map(calculate_pr, r)
9797

9898
pr = numpy.array(pr)
9999
return self.scale.value * pr

‎src/diffpy/srfit/tests/testdiffpyparset.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ def testDiffpyStructureParSet(self):
4242

4343
a1 = Atom("Cu", xyz=numpy.array([0.0, 0.1, 0.2]), Uisoequiv=0.003)
4444
a2 = Atom("Ag", xyz=numpy.array([0.3, 0.4, 0.5]), Uisoequiv=0.002)
45-
l = Lattice(2.5, 2.5, 2.5, 90, 90, 90)
45+
lattice = Lattice(2.5, 2.5, 2.5, 90, 90, 90)
4646

47-
dsstru = Structure([a1, a2], l)
47+
dsstru = Structure([a1, a2], lattice)
4848
# Structure makes copies
4949
a1 = dsstru[0]
5050
a2 = dsstru[1]

‎src/diffpy/srfit/tests/testparameter.py

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -23,52 +23,52 @@
2323
class TestParameter(unittest.TestCase):
2424
def testSetValue(self):
2525
"""Test initialization."""
26-
l = Parameter("l")
26+
l_parameter = Parameter("l")
2727

28-
l.setValue(3.14)
29-
self.assertAlmostEqual(3.14, l.getValue())
28+
l_parameter.setValue(3.14)
29+
self.assertAlmostEqual(3.14, l_parameter.getValue())
3030

3131
# Try array
3232
import numpy
3333

3434
x = numpy.arange(0, 10, 0.1)
35-
l.setValue(x)
36-
self.assertTrue(l.getValue() is x)
37-
self.assertTrue(l.value is x)
35+
l_parameter.setValue(x)
36+
self.assertTrue(l_parameter.getValue() is x)
37+
self.assertTrue(l_parameter.value is x)
3838

3939
# Change the array
4040
y = numpy.arange(0, 10, 0.5)
41-
l.value = y
42-
self.assertTrue(l.getValue() is y)
43-
self.assertTrue(l.value is y)
41+
l_parameter.value = y
42+
self.assertTrue(l_parameter.getValue() is y)
43+
self.assertTrue(l_parameter.value is y)
4444

4545
# Back to scalar
46-
l.setValue(1.01)
47-
self.assertAlmostEqual(1.01, l.getValue())
48-
self.assertAlmostEqual(1.01, l.value)
46+
l_parameter.setValue(1.01)
47+
self.assertAlmostEqual(1.01, l_parameter.getValue())
48+
self.assertAlmostEqual(1.01, l_parameter.value)
4949
return
5050

5151

5252
class TestParameterProxy(unittest.TestCase):
5353
def testProxy(self):
5454
"""Test the ParameterProxy class."""
55-
l = Parameter("l", 3.14)
55+
l_parameter = Parameter("l", 3.14)
5656

5757
# Try Accessor adaptation
58-
la = ParameterProxy("l2", l)
58+
la = ParameterProxy("l2", l_parameter)
5959

6060
self.assertEqual("l2", la.name)
61-
self.assertEqual(l.getValue(), la.getValue())
61+
self.assertEqual(l_parameter.getValue(), la.getValue())
6262

6363
# Change the parameter
64-
l.value = 2.3
65-
self.assertEqual(l.getValue(), la.getValue())
66-
self.assertEqual(l.value, la.value)
64+
l_parameter.value = 2.3
65+
self.assertEqual(l_parameter.getValue(), la.getValue())
66+
self.assertEqual(l_parameter.value, la.value)
6767

6868
# Change the proxy
6969
la.value = 3.2
70-
self.assertEqual(l.getValue(), la.getValue())
71-
self.assertEqual(l.value, la.value)
70+
self.assertEqual(l_parameter.getValue(), la.getValue())
71+
self.assertEqual(l_parameter.value, la.value)
7272

7373
return
7474

@@ -79,36 +79,36 @@ def testWrapper(self):
7979
8080
This adapts a Parameter to the Parameter interface. :)
8181
"""
82-
l = Parameter("l", 3.14)
82+
l_parameter = Parameter("l", 3.14)
8383

8484
# Try Accessor adaptation
85-
la = ParameterAdapter("l", l, getter=Parameter.getValue, setter=Parameter.setValue)
85+
la = ParameterAdapter("l", l_parameter, getter=Parameter.getValue, setter=Parameter.setValue)
8686

87-
self.assertEqual(l.name, la.name)
88-
self.assertEqual(l.getValue(), la.getValue())
87+
self.assertEqual(l_parameter.name, la.name)
88+
self.assertEqual(l_parameter.getValue(), la.getValue())
8989

9090
# Change the parameter
91-
l.setValue(2.3)
92-
self.assertEqual(l.getValue(), la.getValue())
91+
l_parameter.setValue(2.3)
92+
self.assertEqual(l_parameter.getValue(), la.getValue())
9393

9494
# Change the adapter
9595
la.setValue(3.2)
96-
self.assertEqual(l.getValue(), la.getValue())
96+
self.assertEqual(l_parameter.getValue(), la.getValue())
9797

9898
# Try Attribute adaptation
99-
la = ParameterAdapter("l", l, attr="value")
99+
la = ParameterAdapter("l", l_parameter, attr="value")
100100

101-
self.assertEqual(l.name, la.name)
101+
self.assertEqual(l_parameter.name, la.name)
102102
self.assertEqual("value", la.attr)
103-
self.assertEqual(l.getValue(), la.getValue())
103+
self.assertEqual(l_parameter.getValue(), la.getValue())
104104

105105
# Change the parameter
106-
l.setValue(2.3)
107-
self.assertEqual(l.getValue(), la.getValue())
106+
l_parameter.setValue(2.3)
107+
self.assertEqual(l_parameter.getValue(), la.getValue())
108108

109109
# Change the adapter
110110
la.setValue(3.2)
111-
self.assertEqual(l.getValue(), la.getValue())
111+
self.assertEqual(l_parameter.getValue(), la.getValue())
112112

113113
return
114114

‎src/diffpy/srfit/tests/testsgconstraints.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ def test_ObjCryst_constrainSpaceGroup(self):
5454
stru.sgpars.adppars
5555

5656
# Check the orthorhombic lattice
57-
l = stru.getLattice()
58-
self.assertTrue(l.alpha.const)
59-
self.assertTrue(l.beta.const)
60-
self.assertTrue(l.gamma.const)
61-
self.assertEqual(pi / 2, l.alpha.getValue())
62-
self.assertEqual(pi / 2, l.beta.getValue())
63-
self.assertEqual(pi / 2, l.gamma.getValue())
64-
65-
self.assertFalse(l.a.const)
66-
self.assertFalse(l.b.const)
67-
self.assertFalse(l.c.const)
68-
self.assertEqual(0, len(l._constraints))
57+
lattice = stru.getLattice()
58+
self.assertTrue(lattice.alpha.const)
59+
self.assertTrue(lattice.beta.const)
60+
self.assertTrue(lattice.gamma.const)
61+
self.assertEqual(pi / 2, lattice.alpha.getValue())
62+
self.assertEqual(pi / 2, lattice.beta.getValue())
63+
self.assertEqual(pi / 2, lattice.gamma.getValue())
64+
65+
self.assertFalse(lattice.a.const)
66+
self.assertFalse(lattice.b.const)
67+
self.assertFalse(lattice.c.const)
68+
self.assertEqual(0, len(lattice._constraints))
6969

7070
# Now make sure the scatterers are constrained properly
7171
scatterers = stru.getScatterers()

0 commit comments

Comments
 (0)