Skip to content

Commit 1d89609

Browse files
MarcoGorelliMarco Gorelli
and
Marco Gorelli
authored
Nbqa black (#4168)
* first 5 * notebook 5-10 * notebooks 10-15 * notebooks 15-20 * notebooks 20-25 * notebooks 25-30 * notebooks 25-30 * rest of the notebooks * 🔧 * fixup docs/source/notebooks/SMC2_gaussians.ipynb * fixup docs/source/notebooks/normalizing_flows_overview.ipynb Co-authored-by: Marco Gorelli <[email protected]>
1 parent 7f319c8 commit 1d89609

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2389
-1988
lines changed

.pre-commit-config.yaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,25 @@ repos:
88
rev: 0.3.0
99
hooks:
1010
- id: nbqa
11-
args: ['isort']
11+
args: [black]
12+
name: nbqa-black
13+
alias: nbqa-black
14+
additional_dependencies: [black]
15+
- id: nbqa
16+
args: [isort]
1217
name: nbqa-isort
1318
alias: nbqa-isort
14-
additional_dependencies: ['isort']
19+
additional_dependencies: [isort]
1520
- id: nbqa
16-
args: ['pyupgrade']
21+
args: [pyupgrade]
1722
name: nbqa-pyupgrade
1823
alias: nbqa-pyupgrade
19-
additional_dependencies: ['pyupgrade']
24+
additional_dependencies: [pyupgrade]
2025
- repo: https://github.com/asottile/pyupgrade
2126
rev: v2.7.2
2227
hooks:
2328
- id: pyupgrade
24-
args: ['--py36-plus']
29+
args: [--py36-plus]
2530
- repo: https://github.com/psf/black
2631
rev: 20.8b1
2732
hooks:

docs/source/notebooks/GP-MaunaLoa2.ipynb

Lines changed: 10 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
"%config InlineBackend.figure_format = 'retina'\n",
6969
"RANDOM_SEED = 8927\n",
7070
"np.random.seed(RANDOM_SEED)\n",
71-
"az.style.use('arviz-darkgrid')"
71+
"az.style.use(\"arviz-darkgrid\")"
7272
]
7373
},
7474
{
@@ -1310,9 +1310,7 @@
13101310
" ηq = pm.HalfNormal(\"ηq\", sigma=5)\n",
13111311
"\n",
13121312
" cov1 = η ** 2 * pm.gp.cov.ExpQuad(1, ℓ)\n",
1313-
" cov2 = η ** 2 * pm.gp.cov.ExpQuad(1, ℓ) + ηq ** 2 * pm.gp.cov.Polynomial(\n",
1314-
" 1, x0, 2, c\n",
1315-
" )\n",
1313+
" cov2 = η ** 2 * pm.gp.cov.ExpQuad(1, ℓ) + ηq ** 2 * pm.gp.cov.Polynomial(1, x0, 2, c)\n",
13161314
"\n",
13171315
" # construct changepoint cov\n",
13181316
" sc_cov1 = pm.gp.cov.ScaledCov(1, cov1, logistic, (-a, x0))\n",
@@ -1799,10 +1797,10 @@
17991797
"outputs": [],
18001798
"source": [
18011799
"class CustomWhiteNoise(pm.gp.cov.Covariance):\n",
1802-
" \"\"\" Custom White Noise covariance\n",
1800+
" \"\"\"Custom White Noise covariance\n",
18031801
" - sigma1 is applied to the first n1 points in the data\n",
18041802
" - sigma2 is applied to the next n2 points in the data\n",
1805-
" \n",
1803+
"\n",
18061804
" The total number of data points n = n1 + n2\n",
18071805
" \"\"\"\n",
18081806
"\n",
@@ -1922,11 +1920,7 @@
19221920
" ℓp_decay = pm.Gamma(\"ℓp_decay\", alpha=40, beta=0.1)\n",
19231921
" ℓp_smooth = pm.Normal(\"ℓp_smooth \", mu=1.0, sigma=0.05)\n",
19241922
" period = 1 * 0.01 # we know the period is annual\n",
1925-
" cov_p = (\n",
1926-
" ηp ** 2\n",
1927-
" * pm.gp.cov.Periodic(1, period, ℓp_smooth)\n",
1928-
" * pm.gp.cov.ExpQuad(1, ℓp_decay)\n",
1929-
" )\n",
1923+
" cov_p = ηp ** 2 * pm.gp.cov.Periodic(1, period, ℓp_smooth) * pm.gp.cov.ExpQuad(1, ℓp_decay)\n",
19301924
" gp_p = pm.gp.Marginal(cov_func=cov_p)\n",
19311925
"\n",
19321926
" gp = gp_c + gp_m + gp_s + gp_p\n",
@@ -1943,9 +1937,7 @@
19431937
" σ2 = pm.Gamma(\"σ2\", alpha=3, beta=50)\n",
19441938
" η_noise = pm.HalfNormal(\"η_noise\", sigma=1)\n",
19451939
" ℓ_noise = pm.Gamma(\"ℓ_noise\", alpha=2, beta=200)\n",
1946-
" cov_noise = η_noise ** 2 * pm.gp.cov.Matern32(1, ℓ_noise) + CustomWhiteNoise(\n",
1947-
" σ1, σ2, 111, 545\n",
1948-
" )\n",
1940+
" cov_noise = η_noise ** 2 * pm.gp.cov.Matern32(1, ℓ_noise) + CustomWhiteNoise(σ1, σ2, 111, 545)\n",
19491941
"\n",
19501942
" y_ = gp.marginal_likelihood(\"y\", X=t_combined[:, None], y=y_n, noise=cov_noise)"
19511943
]
@@ -2141,9 +2133,7 @@
21412133
],
21422134
"source": [
21432135
"plt.figure(figsize=(12, 5))\n",
2144-
"plt.plot(\n",
2145-
" tnew * 100, y_sd * ppc[\"fnew\"][0:200:5, :].T + y_mu, color=\"lightblue\", alpha=0.8\n",
2146-
")\n",
2136+
"plt.plot(tnew * 100, y_sd * ppc[\"fnew\"][0:200:5, :].T + y_mu, color=\"lightblue\", alpha=0.8)\n",
21472137
"plt.plot(\n",
21482138
" [-1000, -1001],\n",
21492139
" [-1000, -1001],\n",
@@ -2198,9 +2188,7 @@
21982188
],
21992189
"source": [
22002190
"plt.figure(figsize=(12, 5))\n",
2201-
"plt.plot(\n",
2202-
" tnew * 100, y_sd * ppc[\"fnew\"][0:200:5, :].T + y_mu, color=\"lightblue\", alpha=0.8\n",
2203-
")\n",
2191+
"plt.plot(tnew * 100, y_sd * ppc[\"fnew\"][0:200:5, :].T + y_mu, color=\"lightblue\", alpha=0.8)\n",
22042192
"plt.plot(\n",
22052193
" [-1000, -1001],\n",
22062194
" [-1000, -1001],\n",
@@ -2325,9 +2313,7 @@
23252313
"source": [
23262314
"plt.figure(figsize=(12, 5))\n",
23272315
"\n",
2328-
"plt.plot(\n",
2329-
" tnew * 100, y_sd * ppc[\"fnew2\"][0:200:10, :].T + y_mu, color=\"lightblue\", alpha=0.8\n",
2330-
")\n",
2316+
"plt.plot(tnew * 100, y_sd * ppc[\"fnew2\"][0:200:10, :].T + y_mu, color=\"lightblue\", alpha=0.8)\n",
23312317
"plt.plot(\n",
23322318
" [-1000, -1001],\n",
23332319
" [-1000, -1001],\n",
@@ -2452,9 +2438,7 @@
24522438
"source": [
24532439
"plt.figure(figsize=(12, 5))\n",
24542440
"\n",
2455-
"plt.plot(\n",
2456-
" tnew * 100, y_sd * ppc[\"fnew3\"][0:200:10, :].T + y_mu, color=\"lightblue\", alpha=0.8\n",
2457-
")\n",
2441+
"plt.plot(tnew * 100, y_sd * ppc[\"fnew3\"][0:200:10, :].T + y_mu, color=\"lightblue\", alpha=0.8)\n",
24582442
"plt.plot(\n",
24592443
" [-1000, -1001],\n",
24602444
" [-1000, -1001],\n",

0 commit comments

Comments
 (0)