Skip to content

Commit 259619d

Browse files
authored
2017.3.6 small adds on lesson 3
1 parent 3ba685c commit 259619d

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

python_basic/python_basic_lesson_03.ipynb

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"source": [
77
"# Lesson 3\n",
88
"\n",
9-
"Python Basic, Lesson 3, v1.0.0, 2016.12 by David.Yi\n",
9+
"Python Basic, Lesson 3, v1.0.1, 2016.12 by David.Yi \n",
10+
"Python Basic, Lesson 3, v1.0.2, 2017.03 modified by Yimeng.Zhang \n",
1011
"\n",
1112
"\n",
1213
"### 上次内容要点\n",
@@ -128,7 +129,7 @@
128129
},
129130
{
130131
"cell_type": "code",
131-
"execution_count": 1,
132+
"execution_count": 2,
132133
"metadata": {
133134
"collapsed": false
134135
},
@@ -138,8 +139,7 @@
138139
"output_type": "stream",
139140
"text": [
140141
"[0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99]\n",
141-
"\n",
142-
" [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]\n"
142+
"[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]\n"
143143
]
144144
}
145145
],
@@ -518,6 +518,9 @@
518518
}
519519
],
520520
"source": [
521+
"# 请注意,函数体内部的语句在执行时,一旦执行到return时,函数就执行完毕,并将结果返回。\n",
522+
"# 因此,函数内部通过条件判断和循环可以实现非常复杂的逻辑。\n",
523+
"\n",
521524
"def my_max(a,b):\n",
522525
" if a > b:\n",
523526
" return a\n",
@@ -544,6 +547,9 @@
544547
}
545548
],
546549
"source": [
550+
"# 函数的不同参数形式--下节课再讲!\n",
551+
"# *number理解为可以传入任意数目个参数,包括0个参数\n",
552+
"\n",
547553
"def my_max(*number):\n",
548554
" print(number)\n",
549555
" return 100\n",
@@ -595,6 +601,8 @@
595601
}
596602
],
597603
"source": [
604+
"# Python的函数返回多值其实就是返回一个tuple,但语法上可以省略括号,写起来更方便\n",
605+
"\n",
598606
"def my_max_min(*number):\n",
599607
" a_list = list(number)\n",
600608
" a_list.sort()\n",
@@ -925,7 +933,7 @@
925933
"name": "python",
926934
"nbconvert_exporter": "python",
927935
"pygments_lexer": "ipython3",
928-
"version": "3.5.2"
936+
"version": "3.5.1"
929937
}
930938
},
931939
"nbformat": 4,

0 commit comments

Comments
 (0)