Skip to content

Joshua Brown #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JoshuaRDBrown wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Joshua Brown #39

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
07a6ad1
Done
Sep 26, 2017
dbcf240
Fix code and complete notebook
JoshuaRDBrown Sep 28, 2017
abcbf40
Complete notebook + fix errors
JoshuaRDBrown Sep 28, 2017
30e8df8
Complete notebook + fix errors
JoshuaRDBrown Sep 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
240 changes: 191 additions & 49 deletions Functions.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,96 @@
"\n"
]
},
{
"cell_type": "code",
"execution_count": 1,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"8\n",
"10\n"
]
}
],
"source": [
"#Answers\n",
"\n",
"#1.\n",
"\n",
"answer = 2 + 6\n",
"print(answer)\n",
"\n",
"#2.\n",
"\n",
"difference = abs(15-25)\n",
"print(difference)"
]
},
{
"cell_type": "code",
"execution_count": 2,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"0.05223880597014925\n"
]
}
],
"source": [
"#3.\n",
"\n",
"divmod(50, 26)\n",
"\n",
"\n",
"#4.\n",
"decimal = 7 / float(134)\n",
"print(decimal)"
]
},
{
"cell_type": "code",
"execution_count": 3,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"50\n"
]
}
],
"source": [
"#5.\n",
"answer2 = 5*10\n",
"print(answer2)"
]
},
{
"cell_type": "code",
"execution_count": 4,
"metadata": {},
"outputs": [
{
"name": "stdout",
"output_type": "stream",
"text": [
"2\n"
]
}
],
"source": [
"#6.\n",
"remainder = 32 % 5\n",
"print(remainder)"
]
},
{
"cell_type": "markdown",
"metadata": {},
Expand All @@ -78,10 +168,8 @@
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"execution_count": 5,
"metadata": {},
"outputs": [],
"source": [
"#this function adds two numbers passed as parameters\n",
Expand All @@ -101,36 +189,80 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 6,
"metadata": {},
"outputs": [],
"outputs": [
{
"data": {
"text/plain": [
"9"
]
},
"execution_count": 6,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"add(4,5)"
]
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 7,
"metadata": {},
"outputs": [],
"outputs": [
{
"data": {
"text/plain": [
"-11"
]
},
"execution_count": 7,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"add(-6,-5)"
]
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 8,
"metadata": {},
"outputs": [],
"outputs": [
{
"data": {
"text/plain": [
"14.6"
]
},
"execution_count": 8,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"add(5.6, 9)"
]
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 9,
"metadata": {},
"outputs": [],
"outputs": [
{
"data": {
"text/plain": [
"'helloworld'"
]
},
"execution_count": 9,
"metadata": {},
"output_type": "execute_result"
}
],
"source": [
"add (\"hello\", \"world\") # ooops this is weird!!"
]
Expand Down Expand Up @@ -169,19 +301,29 @@
},
{
"cell_type": "code",
"execution_count": null,
"execution_count": 13,
"metadata": {},
"outputs": [],
"outputs": [
{
"ename": "AssertionError",
"evalue": "Houston we've got a problem",
"output_type": "error",
"traceback": [
"\u001b[0;31m---------------------------------------------------------------------------\u001b[0m",
"\u001b[0;31mAssertionError\u001b[0m Traceback (most recent call last)",
"\u001b[0;32m<ipython-input-13-3b9b6d7c52e5>\u001b[0m in \u001b[0;36m<module>\u001b[0;34m()\u001b[0m\n\u001b[0;32m----> 1\u001b[0;31m \u001b[0;32massert\u001b[0m \u001b[0;36m2\u001b[0m \u001b[0;34m+\u001b[0m \u001b[0;36m2\u001b[0m \u001b[0;34m==\u001b[0m \u001b[0;36m5\u001b[0m\u001b[0;34m,\u001b[0m \u001b[0;34m\"Houston we've got a problem\"\u001b[0m \u001b[0;31m#This will give an AssertionError\u001b[0m\u001b[0;34m\u001b[0m\u001b[0m\n\u001b[0m",
"\u001b[0;31mAssertionError\u001b[0m: Houston we've got a problem"
]
}
],
"source": [
"assert 2 + 2 == 5, \"Houston we've got a problem\" #This will give an AssertionError\n"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"execution_count": 12,
"metadata": {},
"outputs": [],
"source": [
"assert 2 + 2 == 4, \"Houston we've got a problem\" #this won't give an error!"
Expand Down Expand Up @@ -209,22 +351,36 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"# subtract function \n",
"\n",
"# floorDivide function\n",
"\n",
"# divide function\n",
"#subtract function \n",
"def subtract (number1, number2):\n",
" answer = number1-number2\n",
" return answer\n",
"#floorDivide function\n",
"def floorDivide (number1, number2):\n",
" answer = number1//number2\n",
" return answer\n",
"#divide function\n",
"def divideAnswer = number1/number2\n",
" return answer\n",
"\n",
"# multiply function\n",
"\n",
"return answer\n",
"def multiply (number1, number2):\n",
" answer = number1*number2\n",
" \n",
"# getRemainder function\n",
"def getRemainder (number1, number2):\n",
" answer = number1%number2\n",
" return answer\n",
"\n",
"# power function"
"#power function\n",
"def power (number1, number2):\n",
" answer = number1**number2\n",
" return answer"
]
},
{
Expand All @@ -239,9 +395,7 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"assert add(4,5)==9, \"add function not working\""
Expand All @@ -250,9 +404,7 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"assert subtract(4,5)==-1, \"subtract function not working\""
Expand All @@ -261,9 +413,7 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"assert multiply(4,5)==20, \"multiply function not working\""
Expand All @@ -272,9 +422,7 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"assert divide(5,5)==1.0, \"divide function not working\""
Expand All @@ -283,20 +431,16 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"assert floorDivide(1,2)==0.5, \"floor divide function not working\""
"assert floorDivide(1,2)==0, \"floor divide function not working\""
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"assert getRemainder(5,4)==1, \"getRemainder function not working\""
Expand All @@ -305,9 +449,7 @@
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"collapsed": true
},
"metadata": {},
"outputs": [],
"source": [
"assert power(3,2)==9, \"power function not working\""
Expand Down