Skip to content

Commit a490985

Browse files
AllenDowneyAllenDowney
authored
Merge pull request AllenDowney#10 from Bogidon/bogdan/chap-5-typo
Fix typo in chapter 5 notebook (AllenDowney#9)
2 parents 8054670 + 717c058 commit a490985

2 files changed

Lines changed: 83 additions & 28 deletions

File tree

‎code/chap05.ipynb‎

Lines changed: 79 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
{
5252
"cell_type": "code",
5353
"execution_count": 2,
54-
"metadata": {},
54+
"metadata": {
55+
"collapsed": true
56+
},
5557
"outputs": [],
5658
"source": [
5759
"init = State(S=89, I=1, R=0)\n",
@@ -68,7 +70,9 @@
6870
{
6971
"cell_type": "code",
7072
"execution_count": 3,
71-
"metadata": {},
73+
"metadata": {
74+
"collapsed": true
75+
},
7276
"outputs": [],
7377
"source": [
7478
"init /= sum(init)\n",
@@ -177,7 +181,9 @@
177181
{
178182
"cell_type": "code",
179183
"execution_count": 7,
180-
"metadata": {},
184+
"metadata": {
185+
"collapsed": true
186+
},
181187
"outputs": [],
182188
"source": [
183189
"state = update1(init, system)\n",
@@ -224,6 +230,7 @@
224230
"cell_type": "code",
225231
"execution_count": 9,
226232
"metadata": {
233+
"collapsed": true,
227234
"scrolled": true
228235
},
229236
"outputs": [],
@@ -243,7 +250,9 @@
243250
{
244251
"cell_type": "code",
245252
"execution_count": 10,
246-
"metadata": {},
253+
"metadata": {
254+
"collapsed": true
255+
},
247256
"outputs": [],
248257
"source": [
249258
"# Solution goes here"
@@ -306,7 +315,9 @@
306315
{
307316
"cell_type": "code",
308317
"execution_count": 12,
309-
"metadata": {},
318+
"metadata": {
319+
"collapsed": true
320+
},
310321
"outputs": [],
311322
"source": [
312323
"tc = 3 # time between contacts in days \n",
@@ -358,7 +369,9 @@
358369
{
359370
"cell_type": "code",
360371
"execution_count": 14,
361-
"metadata": {},
372+
"metadata": {
373+
"collapsed": true
374+
},
362375
"outputs": [],
363376
"source": [
364377
"plot_results(system.S, system.I, system.R)\n",
@@ -416,7 +429,9 @@
416429
{
417430
"cell_type": "code",
418431
"execution_count": 16,
419-
"metadata": {},
432+
"metadata": {
433+
"collapsed": true
434+
},
420435
"outputs": [],
421436
"source": [
422437
"tc = 3 # time between contacts in days \n",
@@ -425,7 +440,7 @@
425440
"beta = 1 / tc # contact rate in per day\n",
426441
"gamma = 1 / tr # recovery rate in per day\n",
427442
"\n",
428-
"sir = make_system(beta, gamma)\n",
443+
"system = make_system(beta, gamma)\n",
429444
"run_simulation(system, update1)\n",
430445
"system.results.head()"
431446
]
@@ -440,7 +455,9 @@
440455
{
441456
"cell_type": "code",
442457
"execution_count": 17,
443-
"metadata": {},
458+
"metadata": {
459+
"collapsed": true
460+
},
444461
"outputs": [],
445462
"source": [
446463
"frame = system.results\n",
@@ -457,7 +474,9 @@
457474
{
458475
"cell_type": "code",
459476
"execution_count": 18,
460-
"metadata": {},
477+
"metadata": {
478+
"collapsed": true
479+
},
461480
"outputs": [],
462481
"source": [
463482
"# Solution goes here"
@@ -506,7 +525,9 @@
506525
{
507526
"cell_type": "code",
508527
"execution_count": 20,
509-
"metadata": {},
528+
"metadata": {
529+
"collapsed": true
530+
},
510531
"outputs": [],
511532
"source": [
512533
"system.beta = 0.333\n",
@@ -553,6 +574,7 @@
553574
"cell_type": "code",
554575
"execution_count": 22,
555576
"metadata": {
577+
"collapsed": true,
556578
"scrolled": true
557579
},
558580
"outputs": [],
@@ -575,6 +597,7 @@
575597
"cell_type": "code",
576598
"execution_count": 24,
577599
"metadata": {
600+
"collapsed": true,
578601
"scrolled": true
579602
},
580603
"outputs": [],
@@ -596,7 +619,9 @@
596619
{
597620
"cell_type": "code",
598621
"execution_count": 26,
599-
"metadata": {},
622+
"metadata": {
623+
"collapsed": true
624+
},
600625
"outputs": [],
601626
"source": [
602627
"# Solution goes here"
@@ -646,7 +671,9 @@
646671
{
647672
"cell_type": "code",
648673
"execution_count": 28,
649-
"metadata": {},
674+
"metadata": {
675+
"collapsed": true
676+
},
650677
"outputs": [],
651678
"source": [
652679
"tc = 3 # time between contacts in days \n",
@@ -669,7 +696,9 @@
669696
{
670697
"cell_type": "code",
671698
"execution_count": 29,
672-
"metadata": {},
699+
"metadata": {
700+
"collapsed": true
701+
},
673702
"outputs": [],
674703
"source": [
675704
"run_simulation(system, update1)\n",
@@ -686,7 +715,9 @@
686715
{
687716
"cell_type": "code",
688717
"execution_count": 30,
689-
"metadata": {},
718+
"metadata": {
719+
"collapsed": true
720+
},
690721
"outputs": [],
691722
"source": [
692723
"system2 = make_system(beta, gamma)\n",
@@ -707,7 +738,9 @@
707738
{
708739
"cell_type": "code",
709740
"execution_count": 31,
710-
"metadata": {},
741+
"metadata": {
742+
"collapsed": true
743+
},
711744
"outputs": [],
712745
"source": [
713746
"plot(system.results.S, '-', label='No immunization')\n",
@@ -729,7 +762,9 @@
729762
{
730763
"cell_type": "code",
731764
"execution_count": 32,
732-
"metadata": {},
765+
"metadata": {
766+
"collapsed": true
767+
},
733768
"outputs": [],
734769
"source": [
735770
"immunize_array = linspace(0, 1, 11)\n",
@@ -800,7 +835,9 @@
800835
{
801836
"cell_type": "code",
802837
"execution_count": 35,
803-
"metadata": {},
838+
"metadata": {
839+
"collapsed": true
840+
},
804841
"outputs": [],
805842
"source": [
806843
"plot(infected_sweep)\n",
@@ -870,7 +907,9 @@
870907
{
871908
"cell_type": "code",
872909
"execution_count": 37,
873-
"metadata": {},
910+
"metadata": {
911+
"collapsed": true
912+
},
874913
"outputs": [],
875914
"source": [
876915
"spending = linspace(0, 1200, 21)\n",
@@ -918,7 +957,9 @@
918957
{
919958
"cell_type": "code",
920959
"execution_count": 39,
921-
"metadata": {},
960+
"metadata": {
961+
"collapsed": true
962+
},
922963
"outputs": [],
923964
"source": [
924965
"percent_reduction = compute_factor(spending) * 100\n",
@@ -982,7 +1023,9 @@
9821023
{
9831024
"cell_type": "code",
9841025
"execution_count": 41,
985-
"metadata": {},
1026+
"metadata": {
1027+
"collapsed": true
1028+
},
9861029
"outputs": [],
9871030
"source": [
9881031
"tc = 3 # time between contacts in days \n",
@@ -1004,7 +1047,9 @@
10041047
{
10051048
"cell_type": "code",
10061049
"execution_count": 42,
1007-
"metadata": {},
1050+
"metadata": {
1051+
"collapsed": true
1052+
},
10081053
"outputs": [],
10091054
"source": [
10101055
"spending_array = linspace(0, 1200, 13)\n",
@@ -1076,7 +1121,9 @@
10761121
{
10771122
"cell_type": "code",
10781123
"execution_count": 45,
1079-
"metadata": {},
1124+
"metadata": {
1125+
"collapsed": true
1126+
},
10801127
"outputs": [],
10811128
"source": [
10821129
"plot(infected_sweep)\n",
@@ -1113,7 +1160,9 @@
11131160
{
11141161
"cell_type": "code",
11151162
"execution_count": 46,
1116-
"metadata": {},
1163+
"metadata": {
1164+
"collapsed": true
1165+
},
11171166
"outputs": [],
11181167
"source": [
11191168
"num_students = 90\n",
@@ -1136,7 +1185,9 @@
11361185
{
11371186
"cell_type": "code",
11381187
"execution_count": 47,
1139-
"metadata": {},
1188+
"metadata": {
1189+
"collapsed": true
1190+
},
11401191
"outputs": [],
11411192
"source": [
11421193
"for doses in dose_array:\n",
@@ -1216,7 +1267,9 @@
12161267
{
12171268
"cell_type": "code",
12181269
"execution_count": 50,
1219-
"metadata": {},
1270+
"metadata": {
1271+
"collapsed": true
1272+
},
12201273
"outputs": [],
12211274
"source": [
12221275
"plot(infected_sweep)\n",

‎code/chap05soln.ipynb‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -542,7 +542,9 @@
542542
{
543543
"cell_type": "code",
544544
"execution_count": 12,
545-
"metadata": {},
545+
"metadata": {
546+
"collapsed": true
547+
},
546548
"outputs": [],
547549
"source": [
548550
"tc = 3 # time between contacts in days \n",
@@ -754,7 +756,7 @@
754756
"beta = 1 / tc # contact rate in per day\n",
755757
"gamma = 1 / tr # recovery rate in per day\n",
756758
"\n",
757-
"sir = make_system(beta, gamma)\n",
759+
"system = make_system(beta, gamma)\n",
758760
"run_simulation(system, update1)\n",
759761
"system.results.head()"
760762
]

0 commit comments

Comments
 (0)