Skip to content

Commit 104feb0

Browse files
timskovjacobsentimskovjacobsen
committed
fix#7, fix#8 (Finish the last exercise solutions)
1 parent f35b425 commit 104feb0

2 files changed

Lines changed: 398 additions & 108 deletions

File tree

‎Session 2 - Utility functions/Session 2 - Exercise solutions.ipynb‎

Lines changed: 352 additions & 68 deletions
Large diffs are not rendered by default.

‎Session 2 - Utility functions/Session 2 - Utility functions.ipynb‎

Lines changed: 46 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,11 @@
209209
"\n",
210210
"- A module `plotting.py` containing all code responsible for plotting of results. \n",
211211
"\n",
212-
"- A script file `run.py` that imports the modules and is used to run the code. \n",
212+
"- A script file `main.py` that imports the modules and is used to run the code. \n",
213213
"\n",
214214
"---\n",
215215
"```python\n",
216-
"# run.py\n",
216+
"# main.py\n",
217217
"\n",
218218
"import utils\n",
219219
"import plotting\n",
@@ -238,7 +238,7 @@
238238
"\n",
239239
"- encourages the creator to make the code in `utils` and `plotting` more project independent\n",
240240
"\n",
241-
"- makes the actual *working file* (`run.py`) more clean since most of the complicated logic sits inside separate modules\n",
241+
"- makes the actual *working file* (`main.py`) more clean since most of the complicated logic sits inside separate modules\n",
242242
"\n",
243243
"A more [here](https://chrisyeh96.github.io/2017/08/08/definitive-guide-python-imports.html) for a good resource on Python import statements."
244244
]
@@ -314,7 +314,7 @@
314314
},
315315
{
316316
"cell_type": "code",
317-
"execution_count": 18,
317+
"execution_count": 2,
318318
"metadata": {},
319319
"outputs": [
320320
{
@@ -337,7 +337,7 @@
337337
},
338338
{
339339
"cell_type": "code",
340-
"execution_count": 19,
340+
"execution_count": 3,
341341
"metadata": {},
342342
"outputs": [
343343
{
@@ -347,7 +347,7 @@
347347
"traceback": [
348348
"\u001b[1;31m---------------------------------------------------------------------------\u001b[0m",
349349
"\u001b[1;31mTypeError\u001b[0m Traceback (most recent call last)",
350-
"\u001b[1;32m<ipython-input-19-6951c56cbd33>\u001b[0m in \u001b[0;36m<module>\u001b[1;34m\u001b[0m\n\u001b[0;32m 1\u001b[0m \u001b[1;31m# Run the function with an argument when it expects no arguments\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m----> 2\u001b[1;33m \u001b[0mstandard_func\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;34m'Hi'\u001b[0m\u001b[1;33m,\u001b[0m \u001b[1;34m'Ho'\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m",
350+
"\u001b[1;32m<ipython-input-3-5340979a5eb5>\u001b[0m in \u001b[0;36m<module>\u001b[1;34m\u001b[0m\n\u001b[0;32m 1\u001b[0m \u001b[1;31m# Run the function with two arguments when it expects only a single argument\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[1;32m----> 2\u001b[1;33m \u001b[0mstandard_func\u001b[0m\u001b[1;33m(\u001b[0m\u001b[1;34m'Hi'\u001b[0m\u001b[1;33m,\u001b[0m \u001b[1;34m'Ho'\u001b[0m\u001b[1;33m)\u001b[0m\u001b[1;33m\u001b[0m\u001b[1;33m\u001b[0m\u001b[0m\n\u001b[0m",
351351
"\u001b[1;31mTypeError\u001b[0m: standard_func() takes 1 positional argument but 2 were given"
352352
]
353353
}
@@ -370,7 +370,7 @@
370370
},
371371
{
372372
"cell_type": "code",
373-
"execution_count": 22,
373+
"execution_count": 4,
374374
"metadata": {},
375375
"outputs": [
376376
{
@@ -439,7 +439,7 @@
439439
},
440440
{
441441
"cell_type": "code",
442-
"execution_count": 23,
442+
"execution_count": 6,
443443
"metadata": {},
444444
"outputs": [
445445
{
@@ -459,7 +459,7 @@
459459
},
460460
{
461461
"cell_type": "code",
462-
"execution_count": 24,
462+
"execution_count": 7,
463463
"metadata": {},
464464
"outputs": [
465465
{
@@ -490,7 +490,7 @@
490490
},
491491
{
492492
"cell_type": "code",
493-
"execution_count": 6,
493+
"execution_count": 8,
494494
"metadata": {},
495495
"outputs": [
496496
{
@@ -546,7 +546,7 @@
546546
},
547547
{
548548
"cell_type": "code",
549-
"execution_count": 7,
549+
"execution_count": 9,
550550
"metadata": {},
551551
"outputs": [
552552
{
@@ -555,7 +555,7 @@
555555
"array([-2. , -1.5, -1. , -0.5, 0. , 0.5, 1. , 1.5])"
556556
]
557557
},
558-
"execution_count": 7,
558+
"execution_count": 9,
559559
"metadata": {},
560560
"output_type": "execute_result"
561561
}
@@ -592,7 +592,7 @@
592592
},
593593
{
594594
"cell_type": "code",
595-
"execution_count": 8,
595+
"execution_count": 10,
596596
"metadata": {},
597597
"outputs": [
598598
{
@@ -601,7 +601,7 @@
601601
"array([ True, True, True, True, True, False, False, False])"
602602
]
603603
},
604-
"execution_count": 8,
604+
"execution_count": 10,
605605
"metadata": {},
606606
"output_type": "execute_result"
607607
}
@@ -622,7 +622,7 @@
622622
},
623623
{
624624
"cell_type": "code",
625-
"execution_count": 9,
625+
"execution_count": 11,
626626
"metadata": {},
627627
"outputs": [
628628
{
@@ -631,7 +631,7 @@
631631
"array([False, False, True, True, True, True, True, False])"
632632
]
633633
},
634-
"execution_count": 9,
634+
"execution_count": 11,
635635
"metadata": {},
636636
"output_type": "execute_result"
637637
}
@@ -652,7 +652,7 @@
652652
},
653653
{
654654
"cell_type": "code",
655-
"execution_count": 10,
655+
"execution_count": 12,
656656
"metadata": {},
657657
"outputs": [
658658
{
@@ -661,7 +661,7 @@
661661
"(array([0, 1, 2, 3, 4], dtype=int64),)"
662662
]
663663
},
664-
"execution_count": 10,
664+
"execution_count": 12,
665665
"metadata": {},
666666
"output_type": "execute_result"
667667
}
@@ -673,7 +673,7 @@
673673
},
674674
{
675675
"cell_type": "code",
676-
"execution_count": 11,
676+
"execution_count": 13,
677677
"metadata": {},
678678
"outputs": [
679679
{
@@ -682,7 +682,7 @@
682682
"(array([2, 3, 4, 5, 6], dtype=int64),)"
683683
]
684684
},
685-
"execution_count": 11,
685+
"execution_count": 13,
686686
"metadata": {},
687687
"output_type": "execute_result"
688688
}
@@ -717,7 +717,7 @@
717717
},
718718
{
719719
"cell_type": "code",
720-
"execution_count": 12,
720+
"execution_count": 14,
721721
"metadata": {},
722722
"outputs": [
723723
{
@@ -726,7 +726,7 @@
726726
"array([ 1, 2, 3, 11, 12])"
727727
]
728728
},
729-
"execution_count": 12,
729+
"execution_count": 14,
730730
"metadata": {},
731731
"output_type": "execute_result"
732732
}
@@ -758,7 +758,7 @@
758758
},
759759
{
760760
"cell_type": "code",
761-
"execution_count": 13,
761+
"execution_count": 15,
762762
"metadata": {},
763763
"outputs": [
764764
{
@@ -767,7 +767,7 @@
767767
"array([-2. , -1.5, -1. , -0.5, 0. , 0.5, 1. , 1.5])"
768768
]
769769
},
770-
"execution_count": 13,
770+
"execution_count": 15,
771771
"metadata": {},
772772
"output_type": "execute_result"
773773
}
@@ -779,7 +779,7 @@
779779
},
780780
{
781781
"cell_type": "code",
782-
"execution_count": 14,
782+
"execution_count": 16,
783783
"metadata": {},
784784
"outputs": [
785785
{
@@ -788,7 +788,7 @@
788788
"array([3, 4])"
789789
]
790790
},
791-
"execution_count": 14,
791+
"execution_count": 16,
792792
"metadata": {},
793793
"output_type": "execute_result"
794794
}
@@ -801,7 +801,7 @@
801801
},
802802
{
803803
"cell_type": "code",
804-
"execution_count": 15,
804+
"execution_count": 17,
805805
"metadata": {},
806806
"outputs": [
807807
{
@@ -810,7 +810,7 @@
810810
"array([-0.5, 0. ])"
811811
]
812812
},
813-
"execution_count": 15,
813+
"execution_count": 17,
814814
"metadata": {},
815815
"output_type": "execute_result"
816816
}
@@ -924,7 +924,12 @@
924924
" -------\n",
925925
" 1D numpy array\n",
926926
" Array of indices for `x`-values that reside within `x_bounds`.\n",
927-
"'''\n",
927+
" \n",
928+
" Assumptions\n",
929+
" ------------\n",
930+
" The function assumes that the input array `x` is sorted in\n",
931+
" ascending order.\n",
932+
" '''\n",
928933
" # Your code here!\n",
929934
"```\n",
930935
"---\n",
@@ -1033,7 +1038,7 @@
10331038
},
10341039
{
10351040
"cell_type": "code",
1036-
"execution_count": 16,
1041+
"execution_count": 18,
10371042
"metadata": {},
10381043
"outputs": [
10391044
{
@@ -1042,7 +1047,7 @@
10421047
"{'2*0': 0, '2*1': 2, '2*2': 4, '2*3': 6, '2*4': 8}"
10431048
]
10441049
},
1045-
"execution_count": 16,
1050+
"execution_count": 18,
10461051
"metadata": {},
10471052
"output_type": "execute_result"
10481053
}
@@ -1073,7 +1078,7 @@
10731078
"\n",
10741079
"---\n",
10751080
"```python\n",
1076-
"def annotate_points(points_to_annotate, **kwargs):\n",
1081+
"def annotate_points(points_to_annotate, ax, **kwargs):\n",
10771082
" '''\n",
10781083
" Annotate points with corresponding text.\n",
10791084
" \n",
@@ -1082,6 +1087,8 @@
10821087
" points_to_annoate : dict\n",
10831088
" Dictionary with desired annotation text as keys and the (x, y)-\n",
10841089
" coordinates of the annotation as values.\n",
1090+
" ax : matplotlib axis object\n",
1091+
" Axis object on which to plot the annotations. \n",
10851092
" **kwargs : keyword arguments\n",
10861093
" Arguments to be forwarded to the ax.annotate call. \n",
10871094
" '''\n",
@@ -1113,11 +1120,13 @@
11131120
"source": [
11141121
"# Exercise 6\n",
11151122
"\n",
1116-
"Create module `run.py` and import `utils` and `plotting` into it.\n",
1123+
"Create module `main.py` and import `utils` and `plotting` into it.\n",
11171124
"\n",
11181125
"This is now a \"clean\" file that has access to all of our custom functions without looking cluttered. \n",
11191126
"\n",
1120-
"Set up code that for the graph from the test in Exercise 5 and use the functions previously created to annotate only extreme values within a certain interval of your choice."
1127+
"Inside `main.py` create a graph and use the functions previously created to annotate only extreme values within a certain $x$-interval of your choice.\n",
1128+
"\n",
1129+
"You can use the test code from Exercise 3 and 5 if you want."
11211130
]
11221131
},
11231132
{
@@ -1133,9 +1142,6 @@
11331142
"\n",
11341143
"- Specify the number of decimal points for the dict keys that are returned from the `arrays_to_dict` function. This would be prettier when the strings that are stored as keys are eventually annotated in the plot. \n",
11351144
"\n",
1136-
"\n",
1137-
"- Add a parameter to `annotate_points` for choosing which axis (plot) to annotate on. The above implementation annotates on the currently active axis. It would be better to have the current axis be the default while making it possible to choose a specific one. \n",
1138-
"\n",
11391145
"If you start altering your existing, working code remember to make sure that you have that code stored in a commit (snapshot). This way you can always revert to that state if need be.\n"
11401146
]
11411147
},
@@ -1149,7 +1155,7 @@
11491155
},
11501156
{
11511157
"cell_type": "code",
1152-
"execution_count": 17,
1158+
"execution_count": 19,
11531159
"metadata": {},
11541160
"outputs": [
11551161
{
@@ -1422,7 +1428,7 @@
14221428
"<IPython.core.display.HTML object>"
14231429
]
14241430
},
1425-
"execution_count": 17,
1431+
"execution_count": 19,
14261432
"metadata": {},
14271433
"output_type": "execute_result"
14281434
}
@@ -1451,7 +1457,7 @@
14511457
"name": "python",
14521458
"nbconvert_exporter": "python",
14531459
"pygments_lexer": "ipython3",
1454-
"version": "3.7.5"
1460+
"version": "3.7.4"
14551461
},
14561462
"latex_envs": {
14571463
"LaTeX_envs_menu_present": true,

0 commit comments

Comments
 (0)