Skip to content

Commit 21290b5

Browse files
Add files via upload
1 parent e9e0893 commit 21290b5

File tree

4 files changed

+117
-3
lines changed

4 files changed

+117
-3
lines changed

01. Overview.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"#### -Arrays\n",
2727
"#### -Plotting\n",
2828
"\n",
29-
"(It is best to follow the lessons in those steps. Some things, such as __equations__, and __tclab functions__, you aren't required to learn but can be useful. If you wish to learn those, __tclab functions__ and __basic python equations__, are on __cheat sheets__ in seperate files. Other general python info, such as equations, can be found online.)\n",
29+
"(It is best to follow the lessons in those steps. Some things, such as __equations__, and __tclab functions__, you aren't required to learn but can be useful. If you wish to learn those, __useful for tclab__ and __basic python knowledge__, are on seperate files in the same folder. Other general python info, such as equations, can be found online.)\n",
3030
"\n",
3131
"*Installation of TCLab is on the Functions Lesson, number 5. Or in the file, Useful For TCLab*"
3232
]

03. Variables.ipynb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
"Variables are something that stores information in python. For example, if you wanted to keep someone’s age, you would type ```jim = 7```. The first part tells what the variable will be called, and the value after the ```=``` tells what is being stored. \n",
1010
"\n",
1111
"## Values in Variables\n",
12-
"There are many types of values but for now, we’ll just go through the basics. You can run the code using the symbol to the left, but in this case the computer won't tell you anything, because you're just storing values."
12+
"There are many types of values but for now, we’ll just go through the basics. You can run the code using the symbol to the left, but in this case the computer won't tell you anything, because you're just storing values.\n",
13+
"\n",
14+
"(Pro Tip: Another way to run a cell, select the cell you want to run, it should turn blue, then holding ```Ctrl``` and pressing ```Enter```.)"
1315
]
1416
},
1517
{

05. Objects.ipynb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
},
5858
{
5959
"cell_type": "code",
60-
"execution_count": 4,
60+
"execution_count": 2,
6161
"metadata": {},
6262
"outputs": [
6363
{

Basic Python Knowledge.ipynb

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
{
2+
"cells": [
3+
{
4+
"cell_type": "raw",
5+
"metadata": {},
6+
"source": [
7+
"SHORTCUTS\n",
8+
"Press h to see the list of all shortcuts in Jupyter\n",
9+
"\n",
10+
"MATH\n",
11+
"+\tAddition: adds two operands\tx + y\n",
12+
"-\tSubtraction: subtracts two operands\tx - y\n",
13+
"*\tMultiplication: multiplies two operands\tx * y\n",
14+
"/\tDivision (float): divides the first operand by the second\tx / y\n",
15+
"//\tDivision (floor): divides the first operand by the second\tx // y\n",
16+
"%\tModulus: returns the remainder when first operand is divided by the second\tx % y\n",
17+
"\n",
18+
"COMPARE\n",
19+
">\tGreater than: True if left operand is greater than the right\tx > y\n",
20+
"<\tLess than: True if left operand is less than the right\tx < y\n",
21+
"==\tEqual to: True if both operands are equal\tx == y\n",
22+
"!=\tNot equal to - True if operands are not equal\tx != y\n",
23+
">=\tGreater than or equal to: True if left operand is greater than or equal to the right\tx >= y\n",
24+
"<=\tLess than or equal to: True if left operand is less than or equal to the right\tx <= y\n",
25+
"\n",
26+
"LOGICAL \n",
27+
"and\tLogical AND: True if both the operands are true\tx and y\n",
28+
"or\tLogical OR: True if either of the operands is true\tx or y\n",
29+
"not\tLogical NOT: True if operand is false\tnot x\n",
30+
"\n",
31+
"FOR MATLAB PLOTTING\n",
32+
"**Colors**\n",
33+
" \n",
34+
" The following color abbreviations are supported:\n",
35+
" \n",
36+
" ============= ===============================\n",
37+
" character color\n",
38+
" ============= ===============================\n",
39+
" ``'b'`` blue\n",
40+
" ``'g'`` green\n",
41+
" ``'r'`` red\n",
42+
" ``'c'`` cyan\n",
43+
" ``'m'`` magenta\n",
44+
" ``'y'`` yellow\n",
45+
" ``'k'`` black\n",
46+
" ``'w'`` white\n",
47+
" ============= ===============================\n",
48+
" \n",
49+
"**Markers**\n",
50+
" \n",
51+
" ============= ===============================\n",
52+
" character description\n",
53+
" ============= ===============================\n",
54+
" ``'.'`` point marker\n",
55+
" ``','`` pixel marker\n",
56+
" ``'o'`` circle marker\n",
57+
" ``'v'`` triangle_down marker\n",
58+
" ``'^'`` triangle_up marker\n",
59+
" ``'<'`` triangle_left marker\n",
60+
" ``'>'`` triangle_right marker\n",
61+
" ``'1'`` tri_down marker\n",
62+
" ``'2'`` tri_up marker\n",
63+
" ``'3'`` tri_left marker\n",
64+
" ``'4'`` tri_right marker\n",
65+
" ``'s'`` square marker\n",
66+
" ``'p'`` pentagon marker\n",
67+
" ``'*'`` star marker\n",
68+
" ``'h'`` hexagon1 marker\n",
69+
" ``'H'`` hexagon2 marker\n",
70+
" ``'+'`` plus marker\n",
71+
" ``'x'`` x marker\n",
72+
" ``'D'`` diamond marker\n",
73+
" ``'d'`` thin_diamond marker\n",
74+
" ``'|'`` vline marker\n",
75+
" ``'_'`` hline marker\n",
76+
" ============= ===============================\n",
77+
" \n",
78+
" **Line Styles**\n",
79+
" \n",
80+
" ============= ===============================\n",
81+
" character description\n",
82+
" ============= ===============================\n",
83+
" ``'-'`` solid line style\n",
84+
" ``'--'`` dashed line style\n",
85+
" ``'-.'`` dash-dot line style\n",
86+
" ``':'`` dotted line style\n",
87+
" ============= ==============================="
88+
]
89+
}
90+
],
91+
"metadata": {
92+
"kernelspec": {
93+
"display_name": "Python 3",
94+
"language": "python",
95+
"name": "python3"
96+
},
97+
"language_info": {
98+
"codemirror_mode": {
99+
"name": "ipython",
100+
"version": 3
101+
},
102+
"file_extension": ".py",
103+
"mimetype": "text/x-python",
104+
"name": "python",
105+
"nbconvert_exporter": "python",
106+
"pygments_lexer": "ipython3",
107+
"version": "3.7.3"
108+
}
109+
},
110+
"nbformat": 4,
111+
"nbformat_minor": 2
112+
}

0 commit comments

Comments
 (0)