Skip to content

Commit 5657868

Browse files
guipsamoraguipsamora
authored
Merge branch 'master' into patch-1
2 parents 25dd611 + d31031f commit 5657868

File tree

16 files changed

+909
-490
lines changed

16 files changed

+909
-490
lines changed

‎.DS_Store

0 Bytes
Binary file not shown.

‎02_Filtering_&_Sorting/Fictional Army/Exercise.ipynb

Lines changed: 25 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@
2323
{
2424
"cell_type": "code",
2525
"execution_count": 3,
26-
"metadata": {
27-
"collapsed": false
28-
},
26+
"metadata": {},
2927
"outputs": [],
3028
"source": [
3129
"import pandas as pd"
@@ -71,9 +69,7 @@
7169
{
7270
"cell_type": "code",
7371
"execution_count": null,
74-
"metadata": {
75-
"collapsed": false
76-
},
72+
"metadata": {},
7773
"outputs": [],
7874
"source": []
7975
},
@@ -87,9 +83,7 @@
8783
{
8884
"cell_type": "code",
8985
"execution_count": null,
90-
"metadata": {
91-
"collapsed": false
92-
},
86+
"metadata": {},
9387
"outputs": [],
9488
"source": []
9589
},
@@ -103,9 +97,7 @@
10397
{
10498
"cell_type": "code",
10599
"execution_count": null,
106-
"metadata": {
107-
"collapsed": false
108-
},
100+
"metadata": {},
109101
"outputs": [],
110102
"source": []
111103
},
@@ -119,9 +111,7 @@
119111
{
120112
"cell_type": "code",
121113
"execution_count": null,
122-
"metadata": {
123-
"collapsed": false
124-
},
114+
"metadata": {},
125115
"outputs": [],
126116
"source": []
127117
},
@@ -135,9 +125,7 @@
135125
{
136126
"cell_type": "code",
137127
"execution_count": null,
138-
"metadata": {
139-
"collapsed": false
140-
},
128+
"metadata": {},
141129
"outputs": [],
142130
"source": []
143131
},
@@ -151,9 +139,7 @@
151139
{
152140
"cell_type": "code",
153141
"execution_count": null,
154-
"metadata": {
155-
"collapsed": false
156-
},
142+
"metadata": {},
157143
"outputs": [],
158144
"source": []
159145
},
@@ -167,41 +153,35 @@
167153
{
168154
"cell_type": "code",
169155
"execution_count": null,
170-
"metadata": {
171-
"collapsed": false
172-
},
156+
"metadata": {},
173157
"outputs": [],
174158
"source": []
175159
},
176160
{
177161
"cell_type": "markdown",
178162
"metadata": {},
179163
"source": [
180-
"### Step 10. Select every row after the fourth row"
164+
"### Step 10. Select every row after the fourth row and all columns"
181165
]
182166
},
183167
{
184168
"cell_type": "code",
185169
"execution_count": null,
186-
"metadata": {
187-
"collapsed": false
188-
},
170+
"metadata": {},
189171
"outputs": [],
190172
"source": []
191173
},
192174
{
193175
"cell_type": "markdown",
194176
"metadata": {},
195177
"source": [
196-
"### Step 11. Select every row up to the 4th row"
178+
"### Step 11. Select every row up to the 4th row and all columns"
197179
]
198180
},
199181
{
200182
"cell_type": "code",
201183
"execution_count": null,
202-
"metadata": {
203-
"collapsed": false
204-
},
184+
"metadata": {},
205185
"outputs": [],
206186
"source": []
207187
},
@@ -215,9 +195,7 @@
215195
{
216196
"cell_type": "code",
217197
"execution_count": null,
218-
"metadata": {
219-
"collapsed": false
220-
},
198+
"metadata": {},
221199
"outputs": [],
222200
"source": []
223201
},
@@ -231,9 +209,7 @@
231209
{
232210
"cell_type": "code",
233211
"execution_count": null,
234-
"metadata": {
235-
"collapsed": false
236-
},
212+
"metadata": {},
237213
"outputs": [],
238214
"source": []
239215
},
@@ -247,9 +223,7 @@
247223
{
248224
"cell_type": "code",
249225
"execution_count": null,
250-
"metadata": {
251-
"collapsed": false
252-
},
226+
"metadata": {},
253227
"outputs": [],
254228
"source": []
255229
},
@@ -263,9 +237,7 @@
263237
{
264238
"cell_type": "code",
265239
"execution_count": null,
266-
"metadata": {
267-
"collapsed": false
268-
},
240+
"metadata": {},
269241
"outputs": [],
270242
"source": []
271243
},
@@ -279,9 +251,7 @@
279251
{
280252
"cell_type": "code",
281253
"execution_count": null,
282-
"metadata": {
283-
"collapsed": false
284-
},
254+
"metadata": {},
285255
"outputs": [],
286256
"source": []
287257
},
@@ -295,9 +265,7 @@
295265
{
296266
"cell_type": "code",
297267
"execution_count": null,
298-
"metadata": {
299-
"collapsed": false
300-
},
268+
"metadata": {},
301269
"outputs": [],
302270
"source": []
303271
},
@@ -311,32 +279,30 @@
311279
{
312280
"cell_type": "code",
313281
"execution_count": null,
314-
"metadata": {
315-
"collapsed": false
316-
},
282+
"metadata": {},
317283
"outputs": [],
318284
"source": []
319285
}
320286
],
321287
"metadata": {
322288
"kernelspec": {
323-
"display_name": "Python 2",
289+
"display_name": "Python 3",
324290
"language": "python",
325-
"name": "python2"
291+
"name": "python3"
326292
},
327293
"language_info": {
328294
"codemirror_mode": {
329295
"name": "ipython",
330-
"version": 2
296+
"version": 3
331297
},
332298
"file_extension": ".py",
333299
"mimetype": "text/x-python",
334300
"name": "python",
335301
"nbconvert_exporter": "python",
336-
"pygments_lexer": "ipython2",
337-
"version": "2.7.11"
302+
"pygments_lexer": "ipython3",
303+
"version": "3.7.3"
338304
}
339305
},
340306
"nbformat": 4,
341-
"nbformat_minor": 0
307+
"nbformat_minor": 1
342308
}

‎02_Filtering_&_Sorting/Fictional Army/Exercise_with_solutions.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@
707707
"cell_type": "markdown",
708708
"metadata": {},
709709
"source": [
710-
"### Step 10. Select every row after the fourth row"
710+
"### Step 10. Select every row after the fourth row and all columns"
711711
]
712712
},
713713
{
@@ -897,7 +897,7 @@
897897
"cell_type": "markdown",
898898
"metadata": {},
899899
"source": [
900-
"### Step 11. Select every row up to the 4th row"
900+
"### Step 11. Select every row up to the 4th row and all columns"
901901
]
902902
},
903903
{
@@ -1938,7 +1938,7 @@
19381938
"name": "python",
19391939
"nbconvert_exporter": "python",
19401940
"pygments_lexer": "ipython3",
1941-
"version": "3.6.5"
1941+
"version": "3.7.3"
19421942
}
19431943
},
19441944
"nbformat": 4,

0 commit comments

Comments
 (0)