Skip to content

Commit 116fe95

Browse files
committed
style: use one line and less space to format long equations
1 parent 9b197e4 commit 116fe95

File tree

2 files changed

+9
-43
lines changed

2 files changed

+9
-43
lines changed

Diff for: news/line79.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
**Changed:**
66

7-
* reduce the line width limit to 79
7+
* <news item>
88

99
**Deprecated:**
1010

@@ -16,7 +16,7 @@
1616

1717
**Fixed:**
1818

19-
* <news item>
19+
* reduce the line width limit to 79
2020

2121
**Security:**
2222

Diff for: src/diffpy/pdfmorph/morphs/morphshape.py

+7-41
Original file line numberDiff line numberDiff line change
@@ -164,31 +164,19 @@ def _spheroidalCF2(r, psize, axrat):
164164
r = rx[rx <= v * psize]
165165
r2 = r * r
166166
f1 = (
167-
1
168-
- 3 * r / (4 * d * v) * (1 - r2 / (4 * d2) * (1 + 2.0 / (3 * v2)))
169-
- 3
170-
* r
171-
/ (4 * d)
172-
* (1 - r2 / (4 * d2))
173-
* v
174-
/ sqrt(1 - v2)
175-
* atanh(sqrt(1 - v2))
167+
1 - 3*r/(4*d*v)*(1-r2/(4*d2)*(1+2.0/(3*v2))) - 3*r/(4*d)*(1-r2/(4*d2))*v/sqrt(1-v2)*atanh(sqrt(1-v2)) # fmt: skip # noqa: E501
176168
)
177169

178170
r = rx[numpy.logical_and(rx > v * psize, rx <= psize)]
179171
r2 = r * r
172+
# fmt: off
180173
f2 = (
181174
(
182-
3 * d / (8 * r) * (1 + r2 / (2 * d2)) * sqrt(1 - r2 / d2)
183-
- 3
184-
* r
185-
/ (4 * d)
186-
* (1 - r2 / (4 * d2))
187-
* atanh(sqrt(1 - r2 / d2))
175+
3*d/(8*r)*(1+r2/(2*d2))*sqrt(1-r2/d2) - 3*r/(4*d)*(1-r2/(4*d2))*atanh(sqrt(1-r2/d2)) # noqa: E501
188176
)
189-
* v
190-
/ sqrt(1 - v2)
177+
* v / sqrt(1-v2)
191178
)
179+
# fmt: on
192180

193181
r = rx[rx > psize]
194182
f3 = numpy.zeros_like(r)
@@ -199,35 +187,13 @@ def _spheroidalCF2(r, psize, axrat):
199187
r = rx[rx <= psize]
200188
r2 = r * r
201189
f1 = (
202-
1
203-
- 3 * r / (4 * d * v) * (1 - r2 / (4 * d2) * (1 + 2.0 / (3 * v2)))
204-
- 3
205-
* r
206-
/ (4 * d)
207-
* (1 - r2 / (4 * d2))
208-
* v
209-
/ sqrt(v2 - 1)
210-
* atan(sqrt(v2 - 1))
190+
1 - 3*r/(4*d*v)*(1-r2/(4*d2)*(1+2.0/(3*v2))) - 3*r/(4*d)*(1-r2/(4*d2))*v/sqrt(v2-1)*atan(sqrt(v2-1)) # fmt: skip # noqa: E501
211191
)
212192

213193
r = rx[numpy.logical_and(rx > psize, rx <= v * psize)]
214194
r2 = r * r
215195
f2 = (
216-
1
217-
- 3 * r / (4 * d * v) * (1 - r2 / (4 * d2) * (1 + 2.0 / (3 * v2)))
218-
- 3.0
219-
/ 8
220-
* (1 + r2 / (2 * d2))
221-
* sqrt(1 - d2 / r2)
222-
* v
223-
/ sqrt(v2 - 1)
224-
- 3
225-
* r
226-
/ (4 * d)
227-
* (1 - r2 / (4 * d2))
228-
* v
229-
/ sqrt(v2 - 1)
230-
* (atan(sqrt(v2 - 1)) - atan(sqrt(r2 / d2 - 1)))
196+
1 - 3*r/(4*d*v)*(1-r2/(4*d2)*(1+2.0/(3*v2))) - 3.0/8*(1+r2/(2*d2))*sqrt(1-d2/r2)*v/sqrt(v2-1) - 3*r/(4*d)*(1-r2/(4*d2))*v/sqrt(v2-1)*(atan(sqrt(v2-1))-atan(sqrt(r2/d2-1))) # fmt: skip # noqa:E501
231197
)
232198

233199
r = rx[rx > v * psize]

0 commit comments

Comments
 (0)