Skip to content

Commit

Permalink
fix numbers table
Browse files Browse the repository at this point in the history
  • Loading branch information
Pierian-Data committed May 25, 2017
1 parent 94ff6b6 commit e4ec1b7
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 20 deletions.
34 changes: 23 additions & 11 deletions .ipynb_checkpoints/Numbers-checkpoint.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"#Numbers and more in Python!\n",
"# Numbers and more in Python!\n",
"\n",
"In this lecture, we will learn about numbers in Python and how to use them.\n",
"\n",
Expand All @@ -30,8 +30,13 @@
"\n",
"Throughout this course we will be mainly working with integers or simple float number types.\n",
"\n",
"Here is a table of the two main types we will spend most of our time working with some examples:\n",
"\n",
"Here is a table of the two main types we will spend most of our time working with some examples:"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"<table border = “1“>\n",
"<caption>Numbers in Python</caption> \n",
"<tr>\n",
Expand All @@ -44,7 +49,13 @@
"<tr>\n",
"</tr>\n",
" </table>\n",
" \n",
" "
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
" \n",
" \n",
"Now let's start with some basic arithmetic."
Expand Down Expand Up @@ -155,7 +166,7 @@
"source": [
"### <font color='red'>Python 3 Alert!</font>\n",
"\n",
"**Woah! What just happened? Last time I checked, 3 divided by 2 is equal 1.5 not 1!**\n",
"**Whoa! What just happened? Last time I checked, 3 divided by 2 is equal 1.5 not 1!**\n",
"\n",
"The reason we get this result is because we are using Python 2. In Python 2, the / symbol performs what is known as \"*classic*\" division, this means that the decimal points are truncated (cut off). In Python 3 however, a single / performs \"*true*\" division. So you would get 1.5 if you had inputed 3/2 in Python 3.\n",
"\n",
Expand Down Expand Up @@ -280,7 +291,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"When you import division from the __future__ you won't need to worry about classic division occuring anymore anywhere in your code!"
"When you import division from the __future__ you won't need to worry about classic division occurring anymore anywhere in your code!"
]
},
{
Expand Down Expand Up @@ -606,22 +617,23 @@
}
],
"metadata": {
"anaconda-cloud": {},
"kernelspec": {
"display_name": "Python 2",
"display_name": "Python [conda root]",
"language": "python",
"name": "python2"
"name": "conda-root-py"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 2
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython2",
"version": "2.7.10"
"pygments_lexer": "ipython3",
"version": "3.5.3"
}
},
"nbformat": 4,
Expand Down
30 changes: 21 additions & 9 deletions Numbers.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"#Numbers and more in Python!\n",
"# Numbers and more in Python!\n",
"\n",
"In this lecture, we will learn about numbers in Python and how to use them.\n",
"\n",
Expand All @@ -30,8 +30,13 @@
"\n",
"Throughout this course we will be mainly working with integers or simple float number types.\n",
"\n",
"Here is a table of the two main types we will spend most of our time working with some examples:\n",
"\n",
"Here is a table of the two main types we will spend most of our time working with some examples:"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"<table border = “1“>\n",
"<caption>Numbers in Python</caption> \n",
"<tr>\n",
Expand All @@ -44,7 +49,13 @@
"<tr>\n",
"</tr>\n",
" </table>\n",
" \n",
" "
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
" \n",
" \n",
"Now let's start with some basic arithmetic."
Expand Down Expand Up @@ -606,22 +617,23 @@
}
],
"metadata": {
"anaconda-cloud": {},
"kernelspec": {
"display_name": "Python 2",
"display_name": "Python [conda root]",
"language": "python",
"name": "python2"
"name": "conda-root-py"
},
"language_info": {
"codemirror_mode": {
"name": "ipython",
"version": 2
"version": 3
},
"file_extension": ".py",
"mimetype": "text/x-python",
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython2",
"version": "2.7.10"
"pygments_lexer": "ipython3",
"version": "3.5.3"
}
},
"nbformat": 4,
Expand Down

0 comments on commit e4ec1b7

Please sign in to comment.