Skip to content

Commit bb377df

Browse files
committed
update
1 parent 05db35b commit bb377df

File tree

1 file changed

+19
-21
lines changed

1 file changed

+19
-21
lines changed

04-OOP-Inheritance.ipynb

+19-21
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
},
125125
{
126126
"cell_type": "code",
127-
"execution_count": 3,
127+
"execution_count": 2,
128128
"source": [
129129
"class Developer(Employee):\n",
130130
" pass"
@@ -134,7 +134,7 @@
134134
},
135135
{
136136
"cell_type": "code",
137-
"execution_count": 5,
137+
"execution_count": 3,
138138
"source": [
139139
"developer1 = Developer(\"Ali\", \"Ahmadi\")\n",
140140
"\n",
@@ -149,18 +149,18 @@
149149
" 'surname': 'Ahmadi',\n",
150150
" 'email': '[email protected]',\n",
151151
" 'hours': 0,\n",
152-
" 'id': '00002'}"
152+
" 'id': '00001'}"
153153
]
154154
},
155155
"metadata": {},
156-
"execution_count": 5
156+
"execution_count": 3
157157
}
158158
],
159159
"metadata": {}
160160
},
161161
{
162162
"cell_type": "code",
163-
"execution_count": 7,
163+
"execution_count": 4,
164164
"source": [
165165
"# method resolution order\n",
166166
"help(Developer)"
@@ -215,7 +215,7 @@
215215
" | ----------------------------------------------------------------------\n",
216216
" | Data and other attributes inherited from Employee:\n",
217217
" | \n",
218-
" | count = 2\n",
218+
" | count = 1\n",
219219
" | \n",
220220
" | hourly_wage = 20\n",
221221
"\n"
@@ -233,7 +233,7 @@
233233
},
234234
{
235235
"cell_type": "code",
236-
"execution_count": 8,
236+
"execution_count": 5,
237237
"source": [
238238
"class Developer(Employee):\n",
239239
" hourly_wage = 30"
@@ -243,7 +243,7 @@
243243
},
244244
{
245245
"cell_type": "code",
246-
"execution_count": 9,
246+
"execution_count": 6,
247247
"source": [
248248
"developer1 = Developer(\"John\", \"Smith\")\n",
249249
"developer1.add_daily_hours(8)\n",
@@ -258,7 +258,7 @@
258258
]
259259
},
260260
"metadata": {},
261-
"execution_count": 9
261+
"execution_count": 6
262262
}
263263
],
264264
"metadata": {}
@@ -272,7 +272,7 @@
272272
},
273273
{
274274
"cell_type": "code",
275-
"execution_count": 21,
275+
"execution_count": 7,
276276
"source": [
277277
"class Developer(Employee):\n",
278278
" hourly_wage = 30\n",
@@ -286,7 +286,7 @@
286286
},
287287
{
288288
"cell_type": "code",
289-
"execution_count": 20,
289+
"execution_count": 8,
290290
"source": [
291291
"# create objects\n",
292292
"developer1 = Developer(\"John\", \"Smith\", \"Python\")\n",
@@ -301,8 +301,6 @@
301301
"output_type": "stream",
302302
"name": "stdout",
303303
"text": [
304-
"{'name': 'John', 'surname': 'Smith', 'email': '[email protected]', 'hours': 0, 'id': '00014'}\n",
305-
"{'name': 'David', 'surname': 'Jhonson', 'email': '[email protected]', 'hours': 0, 'id': '00015'}\n",
306304
307305
308306
]
@@ -319,7 +317,7 @@
319317
},
320318
{
321319
"cell_type": "code",
322-
"execution_count": 22,
320+
"execution_count": 9,
323321
"source": [
324322
"class Manager(Employee):\n",
325323
" hourly_wage = 50\n",
@@ -343,7 +341,7 @@
343341
},
344342
{
345343
"cell_type": "code",
346-
"execution_count": 28,
344+
"execution_count": 10,
347345
"source": [
348346
"class Manager(Employee):\n",
349347
" hourly_wage = 50\n",
@@ -369,7 +367,7 @@
369367
},
370368
{
371369
"cell_type": "code",
372-
"execution_count": 31,
370+
"execution_count": 11,
373371
"source": [
374372
"# create object\n",
375373
"manager1 = Manager(\"Mat\", \"Anderson\", [developer1])\n",
@@ -394,7 +392,7 @@
394392
},
395393
{
396394
"cell_type": "code",
397-
"execution_count": 32,
395+
"execution_count": 12,
398396
"source": [
399397
"manager1.remove_employee(developer1)\n",
400398
"manager1.print_employees()"
@@ -421,7 +419,7 @@
421419
},
422420
{
423421
"cell_type": "code",
424-
"execution_count": 34,
422+
"execution_count": 13,
425423
"source": [
426424
"print(isinstance(manager1, Manager))\n",
427425
"print(isinstance(manager1, Employee))\n",
@@ -442,7 +440,7 @@
442440
},
443441
{
444442
"cell_type": "code",
445-
"execution_count": 37,
443+
"execution_count": 14,
446444
"source": [
447445
"print(issubclass(Manager, Employee))\n",
448446
"print(issubclass(Developer, Employee))"
@@ -461,7 +459,7 @@
461459
},
462460
{
463461
"cell_type": "code",
464-
"execution_count": 42,
462+
"execution_count": 15,
465463
"source": [
466464
"class Manager(Employee):\n",
467465
" hourly_wage = 50\n",
@@ -493,7 +491,7 @@
493491
},
494492
{
495493
"cell_type": "code",
496-
"execution_count": 44,
494+
"execution_count": 16,
497495
"source": [
498496
"# create object\n",
499497
"manager1 = Manager(\"Mat\", \"Anderson\", developer1)\n",

0 commit comments

Comments
 (0)