Skip to content

Commit 416e360

Browse files
AllenDowneyAllenDowney
committed
Small updates
1 parent b36af50 commit 416e360

4 files changed

Lines changed: 88 additions & 96 deletions

File tree

‎notebooks/chap01.ipynb‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -454,16 +454,6 @@
454454
"**Exercise:** Select \"Restart & Run All\" now and confirm that it does what you want."
455455
]
456456
},
457-
{
458-
"cell_type": "code",
459-
"execution_count": 21,
460-
"metadata": {},
461-
"outputs": [],
462-
"source": [
463-
"for p in linspace(0, 1, 3):\n",
464-
" print(p)"
465-
]
466-
},
467457
{
468458
"cell_type": "code",
469459
"execution_count": null,

‎notebooks/chap13.ipynb‎

Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
{
1717
"cell_type": "code",
18-
"execution_count": 1,
18+
"execution_count": 2,
1919
"metadata": {},
2020
"outputs": [],
2121
"source": [
@@ -45,7 +45,7 @@
4545
},
4646
{
4747
"cell_type": "code",
48-
"execution_count": 2,
48+
"execution_count": 3,
4949
"metadata": {},
5050
"outputs": [],
5151
"source": [
@@ -69,7 +69,7 @@
6969
},
7070
{
7171
"cell_type": "code",
72-
"execution_count": 3,
72+
"execution_count": 4,
7373
"metadata": {},
7474
"outputs": [],
7575
"source": [
@@ -89,7 +89,7 @@
8989
},
9090
{
9191
"cell_type": "code",
92-
"execution_count": 4,
92+
"execution_count": 5,
9393
"metadata": {},
9494
"outputs": [],
9595
"source": [
@@ -105,7 +105,7 @@
105105
},
106106
{
107107
"cell_type": "code",
108-
"execution_count": 5,
108+
"execution_count": 6,
109109
"metadata": {},
110110
"outputs": [],
111111
"source": [
@@ -130,7 +130,7 @@
130130
},
131131
{
132132
"cell_type": "code",
133-
"execution_count": 6,
133+
"execution_count": 7,
134134
"metadata": {},
135135
"outputs": [],
136136
"source": [
@@ -172,7 +172,7 @@
172172
},
173173
{
174174
"cell_type": "code",
175-
"execution_count": 7,
175+
"execution_count": 8,
176176
"metadata": {},
177177
"outputs": [],
178178
"source": [
@@ -189,7 +189,7 @@
189189
},
190190
{
191191
"cell_type": "code",
192-
"execution_count": 8,
192+
"execution_count": 9,
193193
"metadata": {},
194194
"outputs": [],
195195
"source": [
@@ -208,7 +208,7 @@
208208
},
209209
{
210210
"cell_type": "code",
211-
"execution_count": 9,
211+
"execution_count": 10,
212212
"metadata": {},
213213
"outputs": [],
214214
"source": [
@@ -237,7 +237,7 @@
237237
},
238238
{
239239
"cell_type": "code",
240-
"execution_count": 10,
240+
"execution_count": 11,
241241
"metadata": {},
242242
"outputs": [],
243243
"source": [
@@ -246,14 +246,14 @@
246246
},
247247
{
248248
"cell_type": "code",
249-
"execution_count": 11,
249+
"execution_count": 12,
250250
"metadata": {},
251251
"outputs": [],
252252
"source": [
253-
"label = 'γ = ' + str(gamma)\n",
253+
"label = 'gamma = ' + str(gamma)\n",
254254
"plot(infected_sweep, label=label)\n",
255255
"\n",
256-
"decorate(xlabel='Contact rate (β)',\n",
256+
"decorate(xlabel='Contact rate (beta)',\n",
257257
" ylabel='Fraction infected')\n",
258258
"\n",
259259
"savefig('figs/chap13-fig01.pdf')"
@@ -275,7 +275,7 @@
275275
},
276276
{
277277
"cell_type": "code",
278-
"execution_count": 12,
278+
"execution_count": 13,
279279
"metadata": {},
280280
"outputs": [],
281281
"source": [
@@ -291,7 +291,7 @@
291291
},
292292
{
293293
"cell_type": "code",
294-
"execution_count": 13,
294+
"execution_count": 14,
295295
"metadata": {},
296296
"outputs": [],
297297
"source": [
@@ -307,19 +307,23 @@
307307
},
308308
{
309309
"cell_type": "code",
310-
"execution_count": 14,
310+
"execution_count": 29,
311311
"metadata": {},
312312
"outputs": [],
313313
"source": [
314+
"plt.figure(figsize=(7, 4))\n",
315+
"\n",
314316
"for gamma in gamma_array:\n",
315317
" infected_sweep = sweep_beta(beta_array, gamma)\n",
316-
" label = 'γ = ' + str(gamma)\n",
318+
" label = 'gamma = ' + str(gamma)\n",
317319
" plot(infected_sweep, label=label)\n",
318320
" \n",
319-
"decorate(xlabel='Contact rate (β)',\n",
321+
"decorate(xlabel='Contact rate (beta)',\n",
320322
" ylabel='Fraction infected',\n",
321323
" loc='upper left')\n",
322324
"\n",
325+
"plt.legend(bbox_to_anchor=(1.02, 1.02))\n",
326+
"plt.tight_layout()\n",
323327
"savefig('figs/chap13-fig02.pdf')"
324328
]
325329
},
@@ -332,7 +336,7 @@
332336
},
333337
{
334338
"cell_type": "code",
335-
"execution_count": 15,
339+
"execution_count": 16,
336340
"metadata": {},
337341
"outputs": [],
338342
"source": [
@@ -341,7 +345,7 @@
341345
},
342346
{
343347
"cell_type": "code",
344-
"execution_count": 16,
348+
"execution_count": 17,
345349
"metadata": {},
346350
"outputs": [],
347351
"source": [
@@ -350,7 +354,7 @@
350354
},
351355
{
352356
"cell_type": "code",
353-
"execution_count": 17,
357+
"execution_count": 18,
354358
"metadata": {},
355359
"outputs": [],
356360
"source": [
@@ -368,7 +372,7 @@
368372
},
369373
{
370374
"cell_type": "code",
371-
"execution_count": 18,
375+
"execution_count": 19,
372376
"metadata": {},
373377
"outputs": [],
374378
"source": [
@@ -396,7 +400,7 @@
396400
},
397401
{
398402
"cell_type": "code",
399-
"execution_count": 19,
403+
"execution_count": 20,
400404
"metadata": {},
401405
"outputs": [],
402406
"source": [
@@ -413,15 +417,15 @@
413417
},
414418
{
415419
"cell_type": "code",
416-
"execution_count": 20,
420+
"execution_count": 21,
417421
"metadata": {},
418422
"outputs": [],
419423
"source": [
420424
"for gamma in gamma_array:\n",
421-
" label = 'γ = ' + str(gamma)\n",
425+
" label = 'gamma = ' + str(gamma)\n",
422426
" plot(frame[gamma], label=label)\n",
423427
" \n",
424-
"decorate(xlabel='Contact rate (β)',\n",
428+
"decorate(xlabel='Contact rate (beta)',\n",
425429
" ylabel='Fraction infected',\n",
426430
" title='',\n",
427431
" loc='upper left')"
@@ -436,17 +440,22 @@
436440
},
437441
{
438442
"cell_type": "code",
439-
"execution_count": 21,
443+
"execution_count": 28,
440444
"metadata": {},
441445
"outputs": [],
442446
"source": [
447+
"plt.figure(figsize=(7, 4))\n",
448+
"\n",
449+
"\n",
443450
"for beta in [1.1, 0.9, 0.7, 0.5, 0.3]:\n",
444-
" label = 'β = ' + str(beta)\n",
451+
" label = 'beta = ' + str(beta)\n",
445452
" plot(frame.row[beta], label=label)\n",
446453
" \n",
447-
"decorate(xlabel='Recovery rate (γ)',\n",
454+
"decorate(xlabel='Recovery rate (gamma)',\n",
448455
" ylabel='Fraction infected')\n",
449456
"\n",
457+
"plt.legend(bbox_to_anchor=(1.02, 1.02))\n",
458+
"plt.tight_layout()\n",
450459
"savefig('figs/chap13-fig03.pdf')"
451460
]
452461
},
@@ -461,8 +470,10 @@
461470
},
462471
{
463472
"cell_type": "code",
464-
"execution_count": 22,
465-
"metadata": {},
473+
"execution_count": 23,
474+
"metadata": {
475+
"scrolled": true
476+
},
466477
"outputs": [],
467478
"source": [
468479
"contour(frame)\n",

‎soln/chap01soln.ipynb‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -756,26 +756,6 @@
756756
"**Exercise:** Select \"Restart & Run All\" now and confirm that it does what you want."
757757
]
758758
},
759-
{
760-
"cell_type": "code",
761-
"execution_count": 21,
762-
"metadata": {},
763-
"outputs": [
764-
{
765-
"name": "stdout",
766-
"output_type": "stream",
767-
"text": [
768-
"0.0\n",
769-
"0.5\n",
770-
"1.0\n"
771-
]
772-
}
773-
],
774-
"source": [
775-
"for p in linspace(0, 1, 3):\n",
776-
" print(p)"
777-
]
778-
},
779759
{
780760
"cell_type": "code",
781761
"execution_count": null,

0 commit comments

Comments
 (0)