Skip to content

Commit 4af0c16

Browse files
Yimeng-ZhangYimeng-Zhang
authored
2017.3.19 small adds on lesson 4
1 parent 259619d commit 4af0c16

File tree

1 file changed

+81
-71
lines changed

1 file changed

+81
-71
lines changed

‎python_basic/python_basic_lesson_04.ipynb‎

Lines changed: 81 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"source": [
77
"# Lesson 4\n",
88
"\n",
9-
"Python Basic, Lesson 4, v1.0.0, 2016.12 by David.Yi\n",
10-
"\n",
9+
"Python Basic, Lesson 4, v1.0.1, 2016.12 by David.Yi \n",
10+
"Python Basic, Lesson 4, v1.0.2, 2017.03 modified by Yimeng.Zhang\n",
1111
"\n",
1212
"### 上次内容要点\n",
1313
"\n",
@@ -109,9 +109,9 @@
109109
"name": "stdout",
110110
"output_type": "stream",
111111
"text": [
112-
"2016-12-21 20:55:07.110882\n",
113-
"2016-12-21\n",
114-
"1482324907.111266\n"
112+
"2017-03-19 10:43:29.523706\n",
113+
"2017-03-19\n",
114+
"1489891409.523707\n"
115115
]
116116
}
117117
],
@@ -154,7 +154,7 @@
154154
},
155155
{
156156
"cell_type": "code",
157-
"execution_count": 4,
157+
"execution_count": 39,
158158
"metadata": {
159159
"collapsed": false
160160
},
@@ -163,16 +163,16 @@
163163
"name": "stdout",
164164
"output_type": "stream",
165165
"text": [
166-
"1481331570.766874\n",
167-
"1481331570.7669\n",
168-
"1481331570.766905\n",
169-
"1481331570.766909\n",
170-
"1481331570.766913\n",
171-
"1481331570.766918\n",
172-
"1481331570.766922\n",
173-
"1481331570.766926\n",
174-
"1481331570.76693\n",
175-
"1481331570.766934\n"
166+
"1489895039.3264403\n",
167+
"1489895039.3264403\n",
168+
"1489895039.3264403\n",
169+
"1489895039.3264403\n",
170+
"1489895039.3264403\n",
171+
"1489895039.3264403\n",
172+
"1489895039.3264403\n",
173+
"1489895039.3264403\n",
174+
"1489895039.3264403\n",
175+
"1489895039.3264403\n"
176176
]
177177
}
178178
],
@@ -185,7 +185,7 @@
185185
},
186186
{
187187
"cell_type": "code",
188-
"execution_count": 13,
188+
"execution_count": 6,
189189
"metadata": {
190190
"collapsed": false
191191
},
@@ -194,7 +194,7 @@
194194
"name": "stdout",
195195
"output_type": "stream",
196196
"text": [
197-
"time: 0.011875152587890625\n"
197+
"time: 0.012996435165405273\n"
198198
]
199199
}
200200
],
@@ -254,7 +254,7 @@
254254
},
255255
{
256256
"cell_type": "code",
257-
"execution_count": 5,
257+
"execution_count": 36,
258258
"metadata": {
259259
"collapsed": false
260260
},
@@ -263,31 +263,33 @@
263263
"name": "stdout",
264264
"output_type": "stream",
265265
"text": [
266-
"2016-05-02 18:19:59\n",
266+
"2017-01-02 18:19:59\n",
267267
"<class 'datetime.datetime'>\n",
268-
"2016, 12 21 21:06\n",
268+
"\n",
269+
"\n",
270+
"2017, 11, 03 19 11:28\n",
269271
"<class 'str'>\n"
270272
]
271273
}
272274
],
273275
"source": [
274276
"# 字符串转化为日期\n",
275277
"\n",
276-
"dday = datetime.strptime('2016-5-2 18:19:59', '%Y-%m-%d %H:%M:%S')\n",
278+
"dday = datetime.strptime('2017-1-2 18:19:59', '%Y-%m-%d %H:%M:%S')\n",
277279
"print(dday)\n",
278280
"print(type(dday))\n",
279-
"\n",
281+
"print('\\n')\n",
280282
"\n",
281283
"# 日期转换为字符串\n",
282284
"\n",
283-
"sday = datetime.now().strftime('%Y, %m %d %H:%M')\n",
284-
"print(sday)\n",
285-
"print(type(sday))"
285+
"day1 = datetime.now().strftime('%Y, %W, %m %d %H:%M')\n",
286+
"print(day1)\n",
287+
"print(type(day1))"
286288
]
287289
},
288290
{
289291
"cell_type": "code",
290-
"execution_count": 6,
292+
"execution_count": 37,
291293
"metadata": {
292294
"collapsed": false
293295
},
@@ -296,31 +298,9 @@
296298
"name": "stdout",
297299
"output_type": "stream",
298300
"text": [
299-
"Wed, Dec 21 18:22\n"
300-
]
301-
}
302-
],
303-
"source": [
304-
"# 日期转换为字符串\n",
305-
"\n",
306-
"now = datetime.now().strftime('%a, %b %d %H:%M')\n",
307-
"print(now)"
308-
]
309-
},
310-
{
311-
"cell_type": "code",
312-
"execution_count": 6,
313-
"metadata": {
314-
"collapsed": false
315-
},
316-
"outputs": [
317-
{
318-
"name": "stdout",
319-
"output_type": "stream",
320-
"text": [
321-
"Wed, Dec 21 21:19\n",
322-
"Wednesday, Dec 21 21:19, 356\n",
323-
"2016-12-21 21:19:33\n"
301+
"Sun, Mar 19 11:28\n",
302+
"Sunday, Mar 19 11:28, 078\n",
303+
"2017-03-19 11:28:19\n"
324304
]
325305
}
326306
],
@@ -337,7 +317,7 @@
337317
},
338318
{
339319
"cell_type": "code",
340-
"execution_count": 7,
320+
"execution_count": 38,
341321
"metadata": {
342322
"collapsed": false
343323
},
@@ -346,21 +326,24 @@
346326
"name": "stdout",
347327
"output_type": "stream",
348328
"text": [
349-
"time.struct_time(tm_year=2016, tm_mon=12, tm_mday=21, tm_hour=21, tm_min=21, tm_sec=18, tm_wday=2, tm_yday=356, tm_isdst=0)\n",
329+
"time.struct_time(tm_year=2017, tm_mon=3, tm_mday=19, tm_hour=11, tm_min=28, tm_sec=26, tm_wday=6, tm_yday=78, tm_isdst=0)\n",
330+
"time.struct_time(tm_year=2017, tm_mon=3, tm_mday=19, tm_hour=11, tm_min=28, tm_sec=26, tm_wday=6, tm_yday=78, tm_isdst=0)\n",
350331
"<class 'time.struct_time'>\n"
351332
]
352333
}
353334
],
354335
"source": [
355-
"# 格式化时间戳为本地的时间\n",
336+
"# 格式化时间戳为本地的时间 converts number of seconds to local time\n",
356337
"\n",
357338
"print(time.localtime(time.time()))\n",
339+
"print(time.localtime()) # If secs is not provided or None, the current time as returned by time() is used\n",
340+
"\n",
358341
"print(type(time.localtime(time.time())))"
359342
]
360343
},
361344
{
362345
"cell_type": "code",
363-
"execution_count": 10,
346+
"execution_count": 21,
364347
"metadata": {
365348
"collapsed": false
366349
},
@@ -369,15 +352,15 @@
369352
"name": "stdout",
370353
"output_type": "stream",
371354
"text": [
372-
"2016-12-10 09:00:30\n",
355+
"2017-03-19 11:02:10\n",
373356
"<class 'str'>\n"
374357
]
375358
}
376359
],
377360
"source": [
378-
"# 时间转换为字符串\n",
361+
"# 本地时间转换为字符串\n",
379362
"\n",
380-
"t = time.strftime('%Y-%m-%d %H:%M:%S',time.localtime(time.time()))\n",
363+
"t = time.strftime('%Y-%m-%d %H:%M:%S',time.localtime())\n",
381364
"print(t)\n",
382365
"print(type(t))"
383366
]
@@ -395,7 +378,7 @@
395378
},
396379
{
397380
"cell_type": "code",
398-
"execution_count": 14,
381+
"execution_count": 22,
399382
"metadata": {
400383
"collapsed": false
401384
},
@@ -404,13 +387,14 @@
404387
"name": "stdout",
405388
"output_type": "stream",
406389
"text": [
407-
"2016-12-22 13:00:56.872066\n",
408-
"2016-12-22 23:00:56.872066\n"
390+
"2017-03-19 11:02:31.916677\n",
391+
"2017-03-19 21:02:31.916677\n"
409392
]
410393
}
411394
],
412395
"source": [
413396
"# 日期计算\n",
397+
"# timedelta(days=0, seconds=0, microseconds=0, milliseconds=0, minutes=0, hours=0, weeks=0)\n",
414398
"\n",
415399
"from datetime import timedelta\n",
416400
"\n",
@@ -455,7 +439,7 @@
455439
"\n",
456440
"#### 位置参数和默认参数\n",
457441
"\n",
458-
"位置参数：必须按照顺序准确传递，如果数量和顺序不对，就会可能造成程序错误；调用函数时候，如果写了参数名称，那么位置就不重要了。\n",
442+
"位置参数：必须按照顺序准确传递，如果数量和顺序不对，就会可能造成程序错误；调用函数时候，如果写了参数名称，那么位置就不重要了。 \n",
459443
"默认参数：在参数申明的时候跟一个用于默认值的赋值语句，如果调用函数的时候没有给出值，那么这个赋值语句就执行。\n",
460444
"\n",
461445
"注意：所有必须的参数要在默认参数之前\n",
@@ -484,7 +468,7 @@
484468
},
485469
{
486470
"cell_type": "code",
487-
"execution_count": 16,
471+
"execution_count": 26,
488472
"metadata": {
489473
"collapsed": false
490474
},
@@ -503,7 +487,7 @@
503487
"# 函数默认参数\n",
504488
"\n",
505489
"def cal_0(money, rate=0.1):\n",
506-
" return money + money * rate\n",
490+
" return money + money * rate \n",
507491
"\n",
508492
"print(cal_0(100))\n",
509493
"print(cal_0(100,0.2))\n",
@@ -512,7 +496,7 @@
512496
},
513497
{
514498
"cell_type": "code",
515-
"execution_count": 10,
499+
"execution_count": 25,
516500
"metadata": {
517501
"collapsed": false
518502
},
@@ -531,14 +515,35 @@
531515
"# 函数默认参数\n",
532516
"\n",
533517
"def cal_1(money, bonus=1000, month=12):\n",
534-
" i = money * month + bonus\n",
518+
" i = money * month + bonus \n",
535519
" return i\n",
536520
"\n",
537521
"print(cal_1(5000))\n",
538522
"print(cal_1(5000, 2000))\n",
539523
"print(cal_1(5000, 2000, 10))"
540524
]
541525
},
526+
{
527+
"cell_type": "code",
528+
"execution_count": null,
529+
"metadata": {
530+
"collapsed": true
531+
},
532+
"outputs": [],
533+
"source": [
534+
"# 画一个三角形 ，n=高度\n",
535+
"'''\n",
536+
" *\n",
537+
" ***\n",
538+
" *****\n",
539+
" *******\n",
540+
" *********\n",
541+
" ***********\n",
542+
" *************\n",
543+
"\n",
544+
"''' "
545+
]
546+
},
542547
{
543548
"cell_type": "code",
544549
"execution_count": 11,
@@ -581,7 +586,7 @@
581586
},
582587
{
583588
"cell_type": "code",
584-
"execution_count": 12,
589+
"execution_count": 40,
585590
"metadata": {
586591
"collapsed": false
587592
},
@@ -609,7 +614,7 @@
609614
},
610615
{
611616
"cell_type": "code",
612-
"execution_count": 4,
617+
"execution_count": 49,
613618
"metadata": {
614619
"collapsed": false
615620
},
@@ -619,6 +624,7 @@
619624
"output_type": "stream",
620625
"text": [
621626
"2.5\n",
627+
"10\n",
622628
"10\n"
623629
]
624630
}
@@ -641,7 +647,11 @@
641647
" return n\n",
642648
" \n",
643649
"print(cal_3('avg', 1,2,3,4))\n",
644-
"print(cal_3('sum', 1,2,3,4))"
650+
"print(cal_3('sum', 1,2,3,4))\n",
651+
"\n",
652+
"# 如果已经有一个list或者tuple，要调用一个可变参数怎么办?\n",
653+
"# 在list或tuple前面加一个*号，把list或tuple的元素变成可变参数传进去：\n",
654+
"print(cal_3('sum',*[1,2,3,4]))"
645655
]
646656
},
647657
{
@@ -932,7 +942,7 @@
932942
"name": "python",
933943
"nbconvert_exporter": "python",
934944
"pygments_lexer": "ipython3",
935-
"version": "3.5.2"
945+
"version": "3.5.1"
936946
}
937947
},
938948
"nbformat": 4,

0 commit comments

Comments
 (0)