Skip to content

Commit 49073fb

Browse files
AllenDowneyAllenDowney
committed
Updating chap07 notebooks
1 parent 027cb8e commit 49073fb

2 files changed

Lines changed: 173 additions & 155 deletions

File tree

‎code/chap07.ipynb‎

Lines changed: 39 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@
277277
"metadata": {},
278278
"outputs": [],
279279
"source": [
280-
"coffee = make_system()\n",
280+
"coffee = make_system(T_init=90, r=0.01, volume=300, t_end=30)\n",
281281
"run_simulation(coffee, update)\n",
282282
"final_temp(coffee)"
283283
]
@@ -409,7 +409,7 @@
409409
" \n",
410410
" returns: difference between final temp and 70 C\n",
411411
" \"\"\"\n",
412-
" system = make_system(r=r)\n",
412+
" system = make_system(T_init=90, r=r, volume=300, t_end=30)\n",
413413
" run_simulation(system, update)\n",
414414
" return final_temp(system) - 70"
415415
]
@@ -439,11 +439,11 @@
439439
},
440440
{
441441
"cell_type": "code",
442-
"execution_count": 21,
442+
"execution_count": 23,
443443
"metadata": {},
444444
"outputs": [],
445445
"source": [
446-
"solution = fsolve(error_func1, 0.01, xtol=1e-8)\n",
446+
"solution = fsolve(error_func1, 0.01)\n",
447447
"r_coffee = solution[0]\n",
448448
"r_coffee"
449449
]
@@ -457,11 +457,11 @@
457457
},
458458
{
459459
"cell_type": "code",
460-
"execution_count": 22,
460+
"execution_count": 24,
461461
"metadata": {},
462462
"outputs": [],
463463
"source": [
464-
"coffee = make_system(r=r_coffee)\n",
464+
"coffee = make_system(T_init=90, r=r_coffee, volume=300, t_end=30)\n",
465465
"run_simulation(coffee, update)\n",
466466
"final_temp(coffee)"
467467
]
@@ -484,19 +484,19 @@
484484
},
485485
{
486486
"cell_type": "code",
487-
"execution_count": 23,
487+
"execution_count": 25,
488488
"metadata": {},
489489
"outputs": [],
490490
"source": [
491491
"r_milk = 0.1\n",
492-
"milk = make_system(T_init=5, t_end=15, r=r_milk)\n",
492+
"milk = make_system(T_init=5, t_end=15, r=r_milk, volume=50)\n",
493493
"run_simulation(milk, update)\n",
494494
"final_temp(milk)"
495495
]
496496
},
497497
{
498498
"cell_type": "code",
499-
"execution_count": 24,
499+
"execution_count": 26,
500500
"metadata": {
501501
"collapsed": true
502502
},
@@ -507,7 +507,7 @@
507507
},
508508
{
509509
"cell_type": "code",
510-
"execution_count": 25,
510+
"execution_count": 27,
511511
"metadata": {},
512512
"outputs": [],
513513
"source": [
@@ -516,7 +516,7 @@
516516
},
517517
{
518518
"cell_type": "code",
519-
"execution_count": 26,
519+
"execution_count": 28,
520520
"metadata": {},
521521
"outputs": [],
522522
"source": [
@@ -525,7 +525,7 @@
525525
},
526526
{
527527
"cell_type": "code",
528-
"execution_count": 27,
528+
"execution_count": 29,
529529
"metadata": {},
530530
"outputs": [],
531531
"source": [
@@ -548,7 +548,7 @@
548548
},
549549
{
550550
"cell_type": "code",
551-
"execution_count": 28,
551+
"execution_count": 30,
552552
"metadata": {
553553
"collapsed": true
554554
},
@@ -585,7 +585,7 @@
585585
},
586586
{
587587
"cell_type": "code",
588-
"execution_count": 29,
588+
"execution_count": 31,
589589
"metadata": {},
590590
"outputs": [],
591591
"source": [
@@ -596,7 +596,7 @@
596596
},
597597
{
598598
"cell_type": "code",
599-
"execution_count": 30,
599+
"execution_count": 32,
600600
"metadata": {},
601601
"outputs": [],
602602
"source": [
@@ -614,7 +614,7 @@
614614
},
615615
{
616616
"cell_type": "code",
617-
"execution_count": 31,
617+
"execution_count": 33,
618618
"metadata": {},
619619
"outputs": [],
620620
"source": [
@@ -636,7 +636,7 @@
636636
},
637637
{
638638
"cell_type": "code",
639-
"execution_count": 32,
639+
"execution_count": 34,
640640
"metadata": {},
641641
"outputs": [],
642642
"source": [
@@ -653,7 +653,7 @@
653653
},
654654
{
655655
"cell_type": "code",
656-
"execution_count": 33,
656+
"execution_count": 35,
657657
"metadata": {
658658
"collapsed": true
659659
},
@@ -665,7 +665,7 @@
665665
},
666666
{
667667
"cell_type": "code",
668-
"execution_count": 34,
668+
"execution_count": 36,
669669
"metadata": {},
670670
"outputs": [],
671671
"source": [
@@ -684,7 +684,7 @@
684684
},
685685
{
686686
"cell_type": "code",
687-
"execution_count": 35,
687+
"execution_count": 37,
688688
"metadata": {
689689
"collapsed": true
690690
},
@@ -722,7 +722,7 @@
722722
},
723723
{
724724
"cell_type": "code",
725-
"execution_count": 36,
725+
"execution_count": 38,
726726
"metadata": {},
727727
"outputs": [],
728728
"source": [
@@ -731,7 +731,7 @@
731731
},
732732
{
733733
"cell_type": "code",
734-
"execution_count": 37,
734+
"execution_count": 39,
735735
"metadata": {},
736736
"outputs": [],
737737
"source": [
@@ -740,7 +740,7 @@
740740
},
741741
{
742742
"cell_type": "code",
743-
"execution_count": 38,
743+
"execution_count": 40,
744744
"metadata": {},
745745
"outputs": [],
746746
"source": [
@@ -756,7 +756,7 @@
756756
},
757757
{
758758
"cell_type": "code",
759-
"execution_count": 39,
759+
"execution_count": 41,
760760
"metadata": {
761761
"collapsed": true
762762
},
@@ -777,7 +777,7 @@
777777
},
778778
{
779779
"cell_type": "code",
780-
"execution_count": 40,
780+
"execution_count": 42,
781781
"metadata": {},
782782
"outputs": [],
783783
"source": [
@@ -814,7 +814,7 @@
814814
},
815815
{
816816
"cell_type": "code",
817-
"execution_count": 44,
817+
"execution_count": 43,
818818
"metadata": {
819819
"collapsed": true
820820
},
@@ -847,7 +847,7 @@
847847
},
848848
{
849849
"cell_type": "code",
850-
"execution_count": 45,
850+
"execution_count": 44,
851851
"metadata": {
852852
"collapsed": true
853853
},
@@ -858,7 +858,7 @@
858858
},
859859
{
860860
"cell_type": "code",
861-
"execution_count": 46,
861+
"execution_count": 45,
862862
"metadata": {},
863863
"outputs": [],
864864
"source": [
@@ -878,7 +878,7 @@
878878
},
879879
{
880880
"cell_type": "code",
881-
"execution_count": 47,
881+
"execution_count": 46,
882882
"metadata": {},
883883
"outputs": [],
884884
"source": [
@@ -898,13 +898,22 @@
898898
},
899899
{
900900
"cell_type": "code",
901-
"execution_count": 48,
901+
"execution_count": 47,
902902
"metadata": {},
903903
"outputs": [],
904904
"source": [
905905
"coffee.results - coffee2.results"
906906
]
907907
},
908+
{
909+
"cell_type": "code",
910+
"execution_count": null,
911+
"metadata": {
912+
"collapsed": true
913+
},
914+
"outputs": [],
915+
"source": []
916+
},
908917
{
909918
"cell_type": "code",
910919
"execution_count": null,

0 commit comments

Comments
 (0)