Skip to content

Commit 52a031d

Browse files
author
fbaptiste
committed
fixed last example in Part 1, Section 10, 7 - Random Choices
1 parent 7d9982b commit 52a031d

File tree

1 file changed

+29
-55
lines changed

1 file changed

+29
-55
lines changed

‎Part 1/Section 10 - Extras/07 - Random Choices.ipynb‎

Lines changed: 29 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@
2121
{
2222
"cell_type": "code",
2323
"execution_count": 1,
24-
"metadata": {
25-
"collapsed": true
26-
},
24+
"metadata": {},
2725
"outputs": [],
2826
"source": [
2927
"import random"
@@ -39,9 +37,7 @@
3937
{
4038
"cell_type": "code",
4139
"execution_count": 2,
42-
"metadata": {
43-
"collapsed": true
44-
},
40+
"metadata": {},
4541
"outputs": [],
4642
"source": [
4743
"random.seed(0)"
@@ -50,9 +46,7 @@
5046
{
5147
"cell_type": "code",
5248
"execution_count": 3,
53-
"metadata": {
54-
"collapsed": true
55-
},
49+
"metadata": {},
5650
"outputs": [],
5751
"source": [
5852
"l = [10, 20, 30, 40, 50, 60]"
@@ -61,9 +55,7 @@
6155
{
6256
"cell_type": "code",
6357
"execution_count": 4,
64-
"metadata": {
65-
"collapsed": true
66-
},
58+
"metadata": {},
6759
"outputs": [],
6860
"source": [
6961
"random_index = random.randrange(len(l))"
@@ -196,9 +188,7 @@
196188
{
197189
"cell_type": "code",
198190
"execution_count": 8,
199-
"metadata": {
200-
"collapsed": true
201-
},
191+
"metadata": {},
202192
"outputs": [],
203193
"source": [
204194
"list_1 = list(range(1000))"
@@ -256,9 +246,7 @@
256246
{
257247
"cell_type": "code",
258248
"execution_count": 11,
259-
"metadata": {
260-
"collapsed": true
261-
},
249+
"metadata": {},
262250
"outputs": [],
263251
"source": [
264252
"list_2 = ['a', 'b', 'c']"
@@ -358,9 +346,7 @@
358346
{
359347
"cell_type": "code",
360348
"execution_count": 15,
361-
"metadata": {
362-
"collapsed": true
363-
},
349+
"metadata": {},
364350
"outputs": [],
365351
"source": [
366352
"weights_2 = [10, 1, 1]"
@@ -410,9 +396,7 @@
410396
{
411397
"cell_type": "code",
412398
"execution_count": 17,
413-
"metadata": {
414-
"collapsed": true
415-
},
399+
"metadata": {},
416400
"outputs": [],
417401
"source": [
418402
"weights_2 = [100, 1, 1]"
@@ -457,9 +441,7 @@
457441
{
458442
"cell_type": "code",
459443
"execution_count": 19,
460-
"metadata": {
461-
"collapsed": true
462-
},
444+
"metadata": {},
463445
"outputs": [],
464446
"source": [
465447
"from collections import namedtuple\n",
@@ -479,9 +461,9 @@
479461
{
480462
"data": {
481463
"text/plain": [
482-
"{'a': Freq(count=331, freq=33.1),\n",
464+
"{'c': Freq(count=335, freq=33.5),\n",
483465
" 'b': Freq(count=334, freq=33.4),\n",
484-
" 'c': Freq(count=335, freq=33.5)}"
466+
" 'a': Freq(count=331, freq=33.1)}"
485467
]
486468
},
487469
"execution_count": 20,
@@ -508,9 +490,9 @@
508490
{
509491
"data": {
510492
"text/plain": [
511-
"{'a': Freq(count=810, freq=81.0),\n",
493+
"{'c': Freq(count=104, freq=10.4),\n",
512494
" 'b': Freq(count=86, freq=8.6),\n",
513-
" 'c': Freq(count=104, freq=10.4)}"
495+
" 'a': Freq(count=810, freq=81.0)}"
514496
]
515497
},
516498
"execution_count": 21,
@@ -552,9 +534,9 @@
552534
{
553535
"data": {
554536
"text/plain": [
555-
"{'a': Freq(count=7996, freq=79.96),\n",
537+
"{'c': Freq(count=942, freq=9.42),\n",
556538
" 'b': Freq(count=1062, freq=10.62),\n",
557-
" 'c': Freq(count=942, freq=9.42)}"
539+
" 'a': Freq(count=7996, freq=79.96)}"
558540
]
559541
},
560542
"execution_count": 22,
@@ -583,9 +565,9 @@
583565
{
584566
"data": {
585567
"text/plain": [
586-
"{'a': Freq(count=810, freq=81.0),\n",
568+
"{'c': Freq(count=104, freq=10.4),\n",
587569
" 'b': Freq(count=86, freq=8.6),\n",
588-
" 'c': Freq(count=104, freq=10.4)}"
570+
" 'a': Freq(count=810, freq=81.0)}"
589571
]
590572
},
591573
"execution_count": 23,
@@ -683,9 +665,7 @@
683665
{
684666
"cell_type": "code",
685667
"execution_count": 26,
686-
"metadata": {
687-
"collapsed": true
688-
},
668+
"metadata": {},
689669
"outputs": [],
690670
"source": [
691671
"from time import perf_counter"
@@ -694,9 +674,7 @@
694674
{
695675
"cell_type": "code",
696676
"execution_count": 27,
697-
"metadata": {
698-
"collapsed": true
699-
},
677+
"metadata": {},
700678
"outputs": [],
701679
"source": [
702680
"denominators = random.choices([0, 1], k=1_000_000)"
@@ -711,7 +689,7 @@
711689
"name": "stdout",
712690
"output_type": "stream",
713691
"text": [
714-
"Avg elapsed time: 1.0296184024998272e-07\n"
692+
"Avg elapsed time: 1.5108646599946952e-07\n"
715693
]
716694
}
717695
],
@@ -735,7 +713,7 @@
735713
"name": "stdout",
736714
"output_type": "stream",
737715
"text": [
738-
"Avg elapsed time: 3.0430142044261676e-07\n"
716+
"Avg elapsed time: 3.9199999800075604e-07\n"
739717
]
740718
}
741719
],
@@ -765,9 +743,7 @@
765743
{
766744
"cell_type": "code",
767745
"execution_count": 30,
768-
"metadata": {
769-
"collapsed": true
770-
},
746+
"metadata": {},
771747
"outputs": [],
772748
"source": [
773749
"denominators = random.choices([0, 1], k=1_000_000, weights=[1, 9])"
@@ -782,7 +758,7 @@
782758
"name": "stdout",
783759
"output_type": "stream",
784760
"text": [
785-
"Avg elapsed time: 1.2833232424613062e-07\n"
761+
"Avg elapsed time: 1.9064371899912659e-07\n"
786762
]
787763
}
788764
],
@@ -806,17 +782,17 @@
806782
"name": "stdout",
807783
"output_type": "stream",
808784
"text": [
809-
"Avg elapsed time: 1.2821015019822802e-07\n"
785+
"Avg elapsed time: 1.7348390699953599e-07\n"
810786
]
811787
}
812788
],
813789
"source": [
814790
"start = perf_counter()\n",
815791
"for denominator in denominators:\n",
816-
" if denominator == 0:\n",
817-
" continue\n",
818-
" else:\n",
792+
" try:\n",
819793
" 10 / denominator\n",
794+
" except ZeroDivisionError:\n",
795+
" continue\n",
820796
" \n",
821797
"end = perf_counter()\n",
822798
"print(f'Avg elapsed time: {(end-start)/len(denominators)}')"
@@ -825,9 +801,7 @@
825801
{
826802
"cell_type": "code",
827803
"execution_count": null,
828-
"metadata": {
829-
"collapsed": true
830-
},
804+
"metadata": {},
831805
"outputs": [],
832806
"source": []
833807
}
@@ -848,7 +822,7 @@
848822
"name": "python",
849823
"nbconvert_exporter": "python",
850824
"pygments_lexer": "ipython3",
851-
"version": "3.6.2"
825+
"version": "3.6.6"
852826
}
853827
},
854828
"nbformat": 4,

0 commit comments

Comments
 (0)