Skip to content

Commit e6f1a3a

Browse files
AllenDowneyAllenDowney
committed
Updating notebooks
1 parent 71e0f32 commit e6f1a3a

19 files changed

Lines changed: 380 additions & 400 deletions

‎code/chap02.ipynb‎

Lines changed: 48 additions & 64 deletions
Large diffs are not rendered by default.

‎code/chap04.ipynb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,7 +506,7 @@
506506
" xlabel='Arrival rate at Olin (p1 in customers/min)', \n",
507507
" ylabel='Number of unhappy customers')\n",
508508
"\n",
509-
"savefig('chap02-fig02.pdf')"
509+
"savefig('figs/chap02-fig02.pdf')"
510510
]
511511
},
512512
{
@@ -669,7 +669,7 @@
669669
"name": "python",
670670
"nbconvert_exporter": "python",
671671
"pygments_lexer": "ipython3",
672-
"version": "3.6.5"
672+
"version": "3.6.6"
673673
}
674674
},
675675
"nbformat": 4,

‎code/chap05.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@
233233
" \n",
234234
"decorate(xlabel='Year',\n",
235235
" ylabel='World population (billion)')\n",
236-
"savefig('chap03-fig01.pdf')"
236+
"savefig('figs/chap03-fig01.pdf')"
237237
]
238238
},
239239
{
@@ -515,7 +515,7 @@
515515
"decorate(xlabel='Year', \n",
516516
" ylabel='World population (billion)',\n",
517517
" title='Constant growth')\n",
518-
"savefig('chap03-fig02.pdf')"
518+
"savefig('figs/chap03-fig02.pdf')"
519519
]
520520
},
521521
{
@@ -568,7 +568,7 @@
568568
"name": "python",
569569
"nbconvert_exporter": "python",
570570
"pygments_lexer": "ipython3",
571-
"version": "3.6.5"
571+
"version": "3.6.6"
572572
}
573573
},
574574
"nbformat": 4,

‎code/chap06.ipynb‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
},
1616
{
1717
"cell_type": "code",
18-
"execution_count": 7,
18+
"execution_count": 1,
1919
"metadata": {},
2020
"outputs": [],
2121
"source": [
@@ -41,7 +41,7 @@
4141
},
4242
{
4343
"cell_type": "code",
44-
"execution_count": 8,
44+
"execution_count": 2,
4545
"metadata": {},
4646
"outputs": [],
4747
"source": [
@@ -55,7 +55,7 @@
5555
},
5656
{
5757
"cell_type": "code",
58-
"execution_count": 9,
58+
"execution_count": 3,
5959
"metadata": {},
6060
"outputs": [],
6161
"source": [
@@ -65,7 +65,7 @@
6565
},
6666
{
6767
"cell_type": "code",
68-
"execution_count": 10,
68+
"execution_count": 4,
6969
"metadata": {},
7070
"outputs": [],
7171
"source": [
@@ -75,7 +75,7 @@
7575
},
7676
{
7777
"cell_type": "code",
78-
"execution_count": 11,
78+
"execution_count": 5,
7979
"metadata": {},
8080
"outputs": [],
8181
"source": [
@@ -106,7 +106,7 @@
106106
},
107107
{
108108
"cell_type": "code",
109-
"execution_count": 12,
109+
"execution_count": 6,
110110
"metadata": {},
111111
"outputs": [],
112112
"source": [
@@ -125,7 +125,7 @@
125125
},
126126
{
127127
"cell_type": "code",
128-
"execution_count": 13,
128+
"execution_count": 7,
129129
"metadata": {},
130130
"outputs": [],
131131
"source": [
@@ -154,7 +154,7 @@
154154
},
155155
{
156156
"cell_type": "code",
157-
"execution_count": 14,
157+
"execution_count": 8,
158158
"metadata": {},
159159
"outputs": [],
160160
"source": [
@@ -184,7 +184,7 @@
184184
},
185185
{
186186
"cell_type": "code",
187-
"execution_count": 15,
187+
"execution_count": 9,
188188
"metadata": {},
189189
"outputs": [],
190190
"source": [
@@ -208,7 +208,7 @@
208208
},
209209
{
210210
"cell_type": "code",
211-
"execution_count": 16,
211+
"execution_count": 10,
212212
"metadata": {},
213213
"outputs": [],
214214
"source": [
@@ -239,7 +239,7 @@
239239
},
240240
{
241241
"cell_type": "code",
242-
"execution_count": 17,
242+
"execution_count": 11,
243243
"metadata": {},
244244
"outputs": [],
245245
"source": [
@@ -256,13 +256,13 @@
256256
},
257257
{
258258
"cell_type": "code",
259-
"execution_count": 18,
259+
"execution_count": 12,
260260
"metadata": {},
261261
"outputs": [],
262262
"source": [
263263
"results = run_simulation2(system)\n",
264264
"plot_results(census, un, results, 'Proportional model')\n",
265-
"savefig('chap03-fig03.pdf')"
265+
"savefig('figs/chap03-fig03.pdf')"
266266
]
267267
},
268268
{
@@ -288,7 +288,7 @@
288288
},
289289
{
290290
"cell_type": "code",
291-
"execution_count": 19,
291+
"execution_count": 13,
292292
"metadata": {
293293
"collapsed": true
294294
},
@@ -317,7 +317,7 @@
317317
},
318318
{
319319
"cell_type": "code",
320-
"execution_count": 20,
320+
"execution_count": 14,
321321
"metadata": {},
322322
"outputs": [],
323323
"source": [
@@ -333,7 +333,7 @@
333333
},
334334
{
335335
"cell_type": "code",
336-
"execution_count": 21,
336+
"execution_count": 15,
337337
"metadata": {},
338338
"outputs": [],
339339
"source": [
@@ -349,7 +349,7 @@
349349
},
350350
{
351351
"cell_type": "code",
352-
"execution_count": 22,
352+
"execution_count": 16,
353353
"metadata": {
354354
"collapsed": true
355355
},
@@ -381,7 +381,7 @@
381381
},
382382
{
383383
"cell_type": "code",
384-
"execution_count": 23,
384+
"execution_count": 17,
385385
"metadata": {},
386386
"outputs": [],
387387
"source": [
@@ -398,7 +398,7 @@
398398
},
399399
{
400400
"cell_type": "code",
401-
"execution_count": 24,
401+
"execution_count": 18,
402402
"metadata": {
403403
"collapsed": true
404404
},
@@ -438,7 +438,7 @@
438438
},
439439
{
440440
"cell_type": "code",
441-
"execution_count": 25,
441+
"execution_count": 19,
442442
"metadata": {
443443
"collapsed": true
444444
},
@@ -466,7 +466,7 @@
466466
},
467467
{
468468
"cell_type": "code",
469-
"execution_count": 26,
469+
"execution_count": 20,
470470
"metadata": {},
471471
"outputs": [],
472472
"source": [
@@ -492,7 +492,7 @@
492492
},
493493
{
494494
"cell_type": "code",
495-
"execution_count": 28,
495+
"execution_count": 21,
496496
"metadata": {
497497
"collapsed": true,
498498
"scrolled": false
@@ -504,7 +504,7 @@
504504
},
505505
{
506506
"cell_type": "code",
507-
"execution_count": 31,
507+
"execution_count": 22,
508508
"metadata": {},
509509
"outputs": [],
510510
"source": [
@@ -528,7 +528,7 @@
528528
"name": "python",
529529
"nbconvert_exporter": "python",
530530
"pygments_lexer": "ipython3",
531-
"version": "3.6.5"
531+
"version": "3.6.6"
532532
}
533533
},
534534
"nbformat": 4,

‎code/chap07.ipynb‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@
198198
"source": [
199199
"results = run_simulation(system, update_func_quad)\n",
200200
"plot_results(census, un, results, 'Quadratic model')\n",
201-
"savefig('chap03-fig04.pdf')"
201+
"savefig('figs/chap03-fig04.pdf')"
202202
]
203203
},
204204
{
@@ -248,7 +248,7 @@
248248
"plot(pop_array, net_growth_array)\n",
249249
"decorate(xlabel='Population (billions)',\n",
250250
" ylabel='Net growth (billions)')\n",
251-
"savefig('chap03-fig05.pdf')\n",
251+
"savefig('figs/chap03-fig05.pdf')\n",
252252
"\n",
253253
"sns.set_style('white')"
254254
]
@@ -526,7 +526,7 @@
526526
"name": "python",
527527
"nbconvert_exporter": "python",
528528
"pygments_lexer": "ipython3",
529-
"version": "3.6.5"
529+
"version": "3.6.6"
530530
}
531531
},
532532
"nbformat": 4,

‎code/chap08.ipynb‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@
414414
"metadata": {},
415415
"outputs": [],
416416
"source": [
417-
"source_code(compute_rel_diff)"
417+
"%psource compute_rel_diff"
418418
]
419419
},
420420
{
@@ -462,7 +462,7 @@
462462
},
463463
{
464464
"cell_type": "code",
465-
"execution_count": 24,
465+
"execution_count": 21,
466466
"metadata": {},
467467
"outputs": [],
468468
"source": [
@@ -471,7 +471,7 @@
471471
},
472472
{
473473
"cell_type": "code",
474-
"execution_count": 25,
474+
"execution_count": 22,
475475
"metadata": {},
476476
"outputs": [],
477477
"source": [
@@ -480,7 +480,7 @@
480480
},
481481
{
482482
"cell_type": "code",
483-
"execution_count": 26,
483+
"execution_count": 23,
484484
"metadata": {},
485485
"outputs": [],
486486
"source": [
@@ -489,7 +489,7 @@
489489
},
490490
{
491491
"cell_type": "code",
492-
"execution_count": 27,
492+
"execution_count": 24,
493493
"metadata": {},
494494
"outputs": [],
495495
"source": [
@@ -498,7 +498,7 @@
498498
},
499499
{
500500
"cell_type": "code",
501-
"execution_count": 28,
501+
"execution_count": 25,
502502
"metadata": {},
503503
"outputs": [],
504504
"source": [
@@ -507,7 +507,7 @@
507507
},
508508
{
509509
"cell_type": "code",
510-
"execution_count": 29,
510+
"execution_count": 26,
511511
"metadata": {},
512512
"outputs": [],
513513
"source": [
@@ -516,7 +516,7 @@
516516
},
517517
{
518518
"cell_type": "code",
519-
"execution_count": 30,
519+
"execution_count": 27,
520520
"metadata": {},
521521
"outputs": [],
522522
"source": [
@@ -525,13 +525,20 @@
525525
},
526526
{
527527
"cell_type": "code",
528-
"execution_count": 31,
528+
"execution_count": 28,
529529
"metadata": {},
530530
"outputs": [],
531531
"source": [
532532
"# Solution goes here"
533533
]
534534
},
535+
{
536+
"cell_type": "markdown",
537+
"metadata": {},
538+
"source": [
539+
"**Related viewing:** You might be interested in this [video by Hans Rosling about the demographic changes we expect in this century](https://www.youtube.com/watch?v=ezVk1ahRF78)."
540+
]
541+
},
535542
{
536543
"cell_type": "code",
537544
"execution_count": null,
@@ -556,7 +563,7 @@
556563
"name": "python",
557564
"nbconvert_exporter": "python",
558565
"pygments_lexer": "ipython3",
559-
"version": "3.6.5"
566+
"version": "3.6.6"
560567
}
561568
},
562569
"nbformat": 4,

‎code/chap14.ipynb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@
517517
"name": "python",
518518
"nbconvert_exporter": "python",
519519
"pygments_lexer": "ipython3",
520-
"version": "3.6.5"
520+
"version": "3.6.6"
521521
}
522522
},
523523
"nbformat": 4,

0 commit comments

Comments
 (0)