Skip to content

Commit 6f6206f

Browse files
author
Wendye
committed
Fixed a few more typos and editing some lesson text.
1 parent 21934b4 commit 6f6206f

File tree

2 files changed

+62
-54
lines changed

2 files changed

+62
-54
lines changed

‎Lesson01_Variables/.ipynb_checkpoints/lesson01-checkpoint.ipynb‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"source": [
1414
"## Values and Types\n",
1515
"Values are basic things a program works with. Values come in several different types:\n",
16-
"* string: Is any value between quotes ('' or \"\") ex. 'Hello Coding Circle', \"I am very smart\", \"342\"\n",
17-
"* integer: Is any whole number, positive or negitive ex. 145, -3, 5\n",
18-
"* float: Is any number with a decimal point ex. 3.14, -2.5 \n",
16+
"* A string is any value between quotes ('' or \"\") e.g. 'Hello Coding Circle', \"I am very smart\", \"342\"\n",
17+
"* An integer is any whole number, positive or negative e.g. 145, -3, 5\n",
18+
"* A float is any number with a decimal point e.g. 3.14, -2.5 \n",
1919
"\n",
2020
"To tell what type a value is, use the built-in function 'type()'"
2121
]
@@ -59,7 +59,7 @@
5959
"source": [
6060
"To print a value to the screen, we use the command 'print'\n",
6161
"\n",
62-
"ex. print 1"
62+
"e.g. print 1"
6363
]
6464
},
6565
{
@@ -93,19 +93,18 @@
9393
]
9494
},
9595
{
96-
"cell_type": "code",
97-
"execution_count": null,
98-
"metadata": {
99-
"collapsed": true
100-
},
101-
"outputs": [],
96+
"cell_type": "markdown",
97+
"metadata": {},
10298
"source": [
10399
"## Variables\n",
104-
"A variable is a name that you give a value. You can then use this name anywhere you would use the value that the name refers to.\n",
100+
"A variable is a name that you give a value. You can then use this name anywhere you would use the value that the name refers to. \n",
105101
"\n",
106-
"The name has some rules, it must only contain letters, numbers, and/or the underscore character ('\\_'). _(That looks like a face...)_ It also cannot start with a number. It can start with an underscore but this usually means something special, so stick to letters for now.\n",
102+
"It has some rules.\n",
103+
"* It must only contain letters, numbers and/or the underscore character. \n",
104+
"* However, it cannot start with a number.\n",
105+
"* It can start with an underscore but this usually means something special so stick to letters for now. \n",
107106
"\n",
108-
"To assign a variable you use the assignment operator: '=' ex. my_name = 'Charlotte'"
107+
"To assign a value to a variable, you use the assignment operator: '=' e.g., my_name = 'Charlotte'"
109108
]
110109
},
111110
{
@@ -125,7 +124,7 @@
125124
"cell_type": "markdown",
126125
"metadata": {},
127126
"source": [
128-
"Notice that when you ran that, nothing printed out. To print a variable, you use the same statement you would use to print the value. ex print WHALE"
127+
"Notice that when you ran that, nothing printed out. To print a variable, you use the same statement you would use to print the value. e.g. print WHALE"
129128
]
130129
},
131130
{
@@ -144,7 +143,7 @@
144143
"metadata": {},
145144
"source": [
146145
"### TRY IT\n",
147-
"assign the name of a sea creature to the variable sea_creature. Then print the value"
146+
"Assign the name of a sea creature to the variable sea_creature. Then print the value."
148147
]
149148
},
150149
{
@@ -154,13 +153,17 @@
154153
"collapsed": false
155154
},
156155
"outputs": [],
157-
"source": []
156+
"source": [
157+
"sea_creature = 'orca'\n",
158+
"print sea_creature"
159+
]
158160
},
159161
{
160162
"cell_type": "markdown",
161163
"metadata": {},
162164
"source": [
163-
"*Reccomendation* try to name your variables with descriptive names. Naming a variable 'a' seems easy to type, but won't help you figure out what it is doing when you come back to your code six months later."
165+
"*Reccomendation* \n",
166+
"Name your variables with descriptive names. Naming a variable 'a' is easy to type but won't help you figure out what it is doing when you come back to your code six months later."
164167
]
165168
},
166169
{
@@ -201,6 +204,7 @@
201204
},
202205
"outputs": [],
203206
"source": [
207+
"apples = 15\n",
204208
"apples_left = 15 - 3\n",
205209
"print apples_left"
206210
]
@@ -301,7 +305,7 @@
301305
"source": [
302306
"## Order of operations\n",
303307
"\n",
304-
"You can combine many operators in a single python statement. The way python evaluates it is the same way you were taught to in elementary school. PEMDAS for Please Excuse My Dear Aunt Sally. Or 1. Parenthesis, 2. Exponents, 3. Multiplication, 4. Division, 5. Addition, 6. Subtraction. Left to right, with that precedence. It is good practice to always include parenthesis to make your intention clear, even if order of operations is on your side."
308+
"You can combine many operators in a single python statement. The way python evaluates it is the same way you were taught to in elementary school. PEMDAS for Please Excuse My Dear Aunt Sally. Or 1. Parentheses, 2. Exponents, 3. Multiplication, 4. Division, 5. Addition, 6. Subtraction. Left to right, with that precedence. It is good practice to always include parentheses to make your intention clear, even if order of operations is on your side."
305309
]
306310
},
307311
{
@@ -332,7 +336,7 @@
332336
"source": [
333337
"## Modulus operator\n",
334338
"\n",
335-
"The modulus operator is not one you were taught in school. It returns the remainder of integer division. It is useful in a few specific cases, but you can go months without using it."
339+
"The modulus operator is not one you were taught in school. It returns the remainder of integer division. It is useful in a few specific cases, but you could go months without using it."
336340
]
337341
},
338342
{
@@ -436,9 +440,9 @@
436440
"source": [
437441
"## Asking the user for input\n",
438442
"\n",
439-
"To get an input for the user we use the command raw_input() and assign it to a variable\n",
443+
"To get an input for the user we use the built-in function raw_input() and assign it to a variable.\n",
440444
"\n",
441-
"The result is always a string"
445+
"NOTE: The result is always a string."
442446
]
443447
},
444448
{
@@ -457,9 +461,9 @@
457461
"cell_type": "markdown",
458462
"metadata": {},
459463
"source": [
460-
"You can pass a string to the raw_input() command to prompt the user with what you are looking for.\n",
464+
"You can pass a string to the raw_input() function to prompt the user for what you are looking for.\n",
461465
"\n",
462-
"ex. raw_input('How are you feeling?')\n",
466+
"e.g. raw_input('How are you feeling?')\n",
463467
"\n",
464468
"Hint, add a new line character \"\\n\" to the end of the prompt to make the user enter it on a new line."
465469
]
@@ -482,9 +486,9 @@
482486
"source": [
483487
"If you want the user to enter a number, you will have to convert the string. Here are the conversion commands.\n",
484488
"\n",
485-
"* To convert a variable to an integer, use int, e.g., int(variable_name)\n",
486-
"* To convert a variable to a float, use float e.g., float(variable_name)\n",
487-
"* To convert a variable to a string, use str e.g., str(variable_name)"
489+
"* To convert a variable to an integer, use int -- e.g., int(variable_name)\n",
490+
"* To convert a variable to a float, use float -- e.g., float(variable_name)\n",
491+
"* To convert a variable to a string, use str -- e.g., str(variable_name)"
488492
]
489493
},
490494
{
@@ -505,7 +509,7 @@
505509
"metadata": {},
506510
"source": [
507511
"### TRY IT\n",
508-
"Prompt the user for their favorite color and store the result in a variable called color"
512+
"Prompt the user for their favorite color and store the value in a variable called color."
509513
]
510514
},
511515
{

‎Lesson01_Variables/lesson01.ipynb‎

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
"source": [
1414
"## Values and Types\n",
1515
"Values are basic things a program works with. Values come in several different types:\n",
16-
"* string: Is any value between quotes ('' or \"\") ex. 'Hello Coding Circle', \"I am very smart\", \"342\"\n",
17-
"* integer: Is any whole number, positive or negitive ex. 145, -3, 5\n",
18-
"* float: Is any number with a decimal point ex. 3.14, -2.5 \n",
16+
"* A string is any value between quotes ('' or \"\") e.g. 'Hello Coding Circle', \"I am very smart\", \"342\"\n",
17+
"* An integer is any whole number, positive or negative e.g. 145, -3, 5\n",
18+
"* A float is any number with a decimal point e.g. 3.14, -2.5 \n",
1919
"\n",
2020
"To tell what type a value is, use the built-in function 'type()'"
2121
]
@@ -59,7 +59,7 @@
5959
"source": [
6060
"To print a value to the screen, we use the command 'print'\n",
6161
"\n",
62-
"ex. print 1"
62+
"e.g. print 1"
6363
]
6464
},
6565
{
@@ -93,19 +93,18 @@
9393
]
9494
},
9595
{
96-
"cell_type": "code",
97-
"execution_count": null,
98-
"metadata": {
99-
"collapsed": true
100-
},
101-
"outputs": [],
96+
"cell_type": "markdown",
97+
"metadata": {},
10298
"source": [
10399
"## Variables\n",
104-
"A variable is a name that you give a value. You can then use this name anywhere you would use the value that the name refers to.\n",
100+
"A variable is a name that you give a value. You can then use this name anywhere you would use the value that the name refers to. \n",
105101
"\n",
106-
"The name has some rules, it must only contain letters, numbers, and/or the underscore character ('\\_'). _(That looks like a face...)_ It also cannot start with a number. It can start with an underscore but this usually means something special, so stick to letters for now.\n",
102+
"It has some rules.\n",
103+
"* It must only contain letters, numbers and/or the underscore character. \n",
104+
"* However, it cannot start with a number.\n",
105+
"* It can start with an underscore but this usually means something special so stick to letters for now. \n",
107106
"\n",
108-
"To assign a variable you use the assignment operator: '=' ex. my_name = 'Charlotte'"
107+
"To assign a value to a variable, you use the assignment operator: '=' e.g., my_name = 'Charlotte'"
109108
]
110109
},
111110
{
@@ -125,7 +124,7 @@
125124
"cell_type": "markdown",
126125
"metadata": {},
127126
"source": [
128-
"Notice that when you ran that, nothing printed out. To print a variable, you use the same statement you would use to print the value. ex print WHALE"
127+
"Notice that when you ran that, nothing printed out. To print a variable, you use the same statement you would use to print the value. e.g. print WHALE"
129128
]
130129
},
131130
{
@@ -144,7 +143,7 @@
144143
"metadata": {},
145144
"source": [
146145
"### TRY IT\n",
147-
"assign the name of a sea creature to the variable sea_creature. Then print the value"
146+
"Assign the name of a sea creature to the variable sea_creature. Then print the value."
148147
]
149148
},
150149
{
@@ -154,13 +153,17 @@
154153
"collapsed": false
155154
},
156155
"outputs": [],
157-
"source": []
156+
"source": [
157+
"sea_creature = 'orca'\n",
158+
"print sea_creature"
159+
]
158160
},
159161
{
160162
"cell_type": "markdown",
161163
"metadata": {},
162164
"source": [
163-
"*Reccomendation* try to name your variables with descriptive names. Naming a variable 'a' seems easy to type, but won't help you figure out what it is doing when you come back to your code six months later."
165+
"*Reccomendation* \n",
166+
"Name your variables with descriptive names. Naming a variable 'a' is easy to type but won't help you figure out what it is doing when you come back to your code six months later."
164167
]
165168
},
166169
{
@@ -201,6 +204,7 @@
201204
},
202205
"outputs": [],
203206
"source": [
207+
"apples = 15\n",
204208
"apples_left = 15 - 3\n",
205209
"print apples_left"
206210
]
@@ -301,7 +305,7 @@
301305
"source": [
302306
"## Order of operations\n",
303307
"\n",
304-
"You can combine many operators in a single python statement. The way python evaluates it is the same way you were taught to in elementary school. PEMDAS for Please Excuse My Dear Aunt Sally. Or 1. Parenthesis, 2. Exponents, 3. Multiplication, 4. Division, 5. Addition, 6. Subtraction. Left to right, with that precedence. It is good practice to always include parenthesis to make your intention clear, even if order of operations is on your side."
308+
"You can combine many operators in a single python statement. The way python evaluates it is the same way you were taught to in elementary school. PEMDAS for Please Excuse My Dear Aunt Sally. Or 1. Parentheses, 2. Exponents, 3. Multiplication, 4. Division, 5. Addition, 6. Subtraction. Left to right, with that precedence. It is good practice to always include parentheses to make your intention clear, even if order of operations is on your side."
305309
]
306310
},
307311
{
@@ -332,7 +336,7 @@
332336
"source": [
333337
"## Modulus operator\n",
334338
"\n",
335-
"The modulus operator is not one you were taught in school. It returns the remainder of integer division. It is useful in a few specific cases, but you can go months without using it."
339+
"The modulus operator is not one you were taught in school. It returns the remainder of integer division. It is useful in a few specific cases, but you could go months without using it."
336340
]
337341
},
338342
{
@@ -436,9 +440,9 @@
436440
"source": [
437441
"## Asking the user for input\n",
438442
"\n",
439-
"To get an input for the user we use the command raw_input() and assign it to a variable\n",
443+
"To get an input for the user we use the built-in function raw_input() and assign it to a variable.\n",
440444
"\n",
441-
"The result is always a string"
445+
"NOTE: The result is always a string."
442446
]
443447
},
444448
{
@@ -457,9 +461,9 @@
457461
"cell_type": "markdown",
458462
"metadata": {},
459463
"source": [
460-
"You can pass a string to the raw_input() command to prompt the user with what you are looking for.\n",
464+
"You can pass a string to the raw_input() function to prompt the user for what you are looking for.\n",
461465
"\n",
462-
"ex. raw_input('How are you feeling?')\n",
466+
"e.g. raw_input('How are you feeling?')\n",
463467
"\n",
464468
"Hint, add a new line character \"\\n\" to the end of the prompt to make the user enter it on a new line."
465469
]
@@ -482,9 +486,9 @@
482486
"source": [
483487
"If you want the user to enter a number, you will have to convert the string. Here are the conversion commands.\n",
484488
"\n",
485-
"* To convert a variable to an integer, use int, e.g., int(variable_name)\n",
486-
"* To convert a variable to a float, use float e.g., float(variable_name)\n",
487-
"* To convert a variable to a string, use str e.g., str(variable_name)"
489+
"* To convert a variable to an integer, use int -- e.g., int(variable_name)\n",
490+
"* To convert a variable to a float, use float -- e.g., float(variable_name)\n",
491+
"* To convert a variable to a string, use str -- e.g., str(variable_name)"
488492
]
489493
},
490494
{
@@ -505,7 +509,7 @@
505509
"metadata": {},
506510
"source": [
507511
"### TRY IT\n",
508-
"Prompt the user for their favorite color and store the value in a variable called color"
512+
"Prompt the user for their favorite color and store the value in a variable called color."
509513
]
510514
},
511515
{

0 commit comments

Comments
 (0)