From bf6c201b2182bdf8016ea49220fbdcc0ac3d1e74 Mon Sep 17 00:00:00 2001 From: prezha Date: Wed, 29 Jun 2016 19:09:31 +0200 Subject: [PATCH 01/11] Update Jupyter (iPython) Notebooks Guide.ipynb Corrected broken link for "Bryn Mawr College Computer Science Guide": instead of: https://athena.brynmawr.edu/hub/dblank/public/Jupyter%20Notebook%20Users%20Manual.ipynb should be: https://athena.brynmawr.edu/jupyter/hub/dblank/public/Jupyter%20Notebook%20Users%20Manual.ipynb Best regards, Predrag Rogic --- Jupyter (iPython) Notebooks Guide.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jupyter (iPython) Notebooks Guide.ipynb b/Jupyter (iPython) Notebooks Guide.ipynb index a8c9178..d61b6c8 100644 --- a/Jupyter (iPython) Notebooks Guide.ipynb +++ b/Jupyter (iPython) Notebooks Guide.ipynb @@ -7,7 +7,7 @@ "# Guide to Using Jupyter Notebooks\n", "In this lecture we will be going over the basics of the Jupyter (previously called iPython Notebooks).\n", "\n", - "For a complete User Manual check out the [Bryn Mawr College Computer Science Guide](http://jupyter.cs.brynmawr.edu/hub/dblank/public/Jupyter%20Notebook%20Users%20Manual.ipynb).\n", + "For a complete User Manual check out the [Bryn Mawr College Computer Science Guide](https://athena.brynmawr.edu/jupyter/hub/dblank/public/Jupyter%20Notebook%20Users%20Manual.ipynb).\n", "\n", "Most of the breakdown will actually occur in the presentation corresponding to this Notebook. So please refer to either the presentation or the full User Manual linked above." ] From 4c3f1c72850de44c786cec564333e9f20ccc741d Mon Sep 17 00:00:00 2001 From: prezha Date: Sun, 3 Jul 2016 15:28:32 +0200 Subject: [PATCH 02/11] Update Milestone Project 1 - Advanced Solution.ipynb ask_player function should also check if the entered int is within allowed 1..9 range --- Milestone Project 1 - Advanced Solution.ipynb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Milestone Project 1 - Advanced Solution.ipynb b/Milestone Project 1 - Advanced Solution.ipynb index 0af4d2f..368f141 100644 --- a/Milestone Project 1 - Advanced Solution.ipynb +++ b/Milestone Project 1 - Advanced Solution.ipynb @@ -163,6 +163,10 @@ " print(\"Sorry, please input a number between 1-9.\")\n", " continue\n", "\n", + " if choice not in range(1,10):\n", + " print(\"Sorry, please input a number between 1-9.\")\n", + " continue\n", + "\n", " if board[choice] == \" \":\n", " board[choice] = mark\n", " break\n", From 7e8b95450f35d1154d16f92c45fc457a1dc799df Mon Sep 17 00:00:00 2001 From: Michael Junio Date: Tue, 6 Sep 2016 19:52:23 -0700 Subject: [PATCH 03/11] Fixed typo in Dictionaries.ipynb --- Dictionaries.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dictionaries.ipynb b/Dictionaries.ipynb index 9abf3c8..836a622 100644 --- a/Dictionaries.ipynb +++ b/Dictionaries.ipynb @@ -313,7 +313,7 @@ "source": [ "## Nesting with Dictionaries\n", "\n", - "Hopefully your starting to see how powerful Python is with its flexibility of nesting objects and calling methods on them. Let's see a dictionary nested inside a dictionary:" + "Hopefully you're starting to see how powerful Python is with its flexibility of nesting objects and calling methods on them. Let's see a dictionary nested inside a dictionary:" ] }, { From 9e8bbe1b74804460e46631f735ef097eb385ab68 Mon Sep 17 00:00:00 2001 From: Michael Junio Date: Tue, 6 Sep 2016 19:58:36 -0700 Subject: [PATCH 04/11] Fixed typo in Dictionaries.ipynb --- Dictionaries.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dictionaries.ipynb b/Dictionaries.ipynb index 836a622..201010b 100644 --- a/Dictionaries.ipynb +++ b/Dictionaries.ipynb @@ -332,7 +332,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Wow! Thats a quite the inception of dictionaries! Let's see how we can grab that value:" + "Wow! That's a quite the inception of dictionaries! Let's see how we can grab that value:" ] }, { From bf48b0772c859ac8c75a07d616caf8a245d1ee1d Mon Sep 17 00:00:00 2001 From: bricklen Date: Wed, 15 Feb 2017 19:57:54 -0800 Subject: [PATCH 05/11] Updated link to Flask decorators. --- Decorators Homework.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Decorators Homework.ipynb b/Decorators Homework.ipynb index 7d62015..6d87dc6 100644 --- a/Decorators Homework.ipynb +++ b/Decorators Homework.ipynb @@ -6,7 +6,7 @@ "source": [ "#Decorators Homework (Optional)\n", "\n", - "Since you won't run into decorators until further in your coding career, this homework is optional. Check out the Web Framework [Flask](http://flask.pocoo.org/). You can use Flask to create web pages with Python (as long as you know some HTML and CSS) and they use decorators a lot! Learn how they use [view decorators](http://flask.pocoo.org/docs/0.10/patterns/viewdecorators/). Don't worry if you don't completely understand everything about Flask, the main point of this optional homework is that you have an awareness of decorators in Web Frameworks, that way if you decide to become a \"Full-Stack\" Python Web Developer, you won't find yourself perplexed by decorators. You can also check out [Django](https://www.djangoproject.com/) another (and more popular) web framework for Python which is a bit more heavy duty.\n", + "Since you won't run into decorators until further in your coding career, this homework is optional. Check out the Web Framework [Flask](http://flask.pocoo.org/). You can use Flask to create web pages with Python (as long as you know some HTML and CSS) and they use decorators a lot! Learn how they use [view decorators](http://flask.pocoo.org/docs/0.12/patterns/viewdecorators/). Don't worry if you don't completely understand everything about Flask, the main point of this optional homework is that you have an awareness of decorators in Web Frameworks, that way if you decide to become a \"Full-Stack\" Python Web Developer, you won't find yourself perplexed by decorators. You can also check out [Django](https://www.djangoproject.com/) another (and more popular) web framework for Python which is a bit more heavy duty.\n", "\n", "Also for some additional info:\n", "\n", From a772b1218709de7c2801d8a7f03260a055718228 Mon Sep 17 00:00:00 2001 From: Lark Fitzgerald Date: Wed, 5 Apr 2017 17:21:04 -0400 Subject: [PATCH 06/11] Update deprecated Latex call to use Label instead --- GUI/3 - Widget Events.ipynb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/GUI/3 - Widget Events.ipynb b/GUI/3 - Widget Events.ipynb index fb69fff..a33d31a 100644 --- a/GUI/3 - Widget Events.ipynb +++ b/GUI/3 - Widget Events.ipynb @@ -304,7 +304,7 @@ "outputs": [], "source": [ "# Create Caption\n", - "caption = widgets.Latex(value = 'The values of slider1 and slider2 are synchronized')\n", + "caption = widgets.Label(value = 'The values of slider1 and slider2 are synchronized')\n", "\n", "# Create IntSlider\n", "slider1 = widgets.IntSlider(description='Slider 1')\n", @@ -326,7 +326,7 @@ "outputs": [], "source": [ "# Create Caption\n", - "caption = widgets.Latex(value = 'Changes in source values are reflected in target1')\n", + "caption = widgets.Label(value = 'Changes in source values are reflected in target1')\n", "\n", "# Create Sliders\n", "source = widgets.IntSlider(description='Source')\n", @@ -380,7 +380,7 @@ "outputs": [], "source": [ "# NO LAG VERSION\n", - "caption = widgets.Latex(value = 'The values of range1 and range2 are synchronized')\n", + "caption = widgets.Label(value = 'The values of range1 and range2 are synchronized')\n", "\n", "range1 = widgets.IntSlider(description='Range 1')\n", "range2 = widgets.IntSlider(description='Range 2')\n", @@ -398,7 +398,7 @@ "outputs": [], "source": [ "# NO LAG VERSION\n", - "caption = widgets.Latex(value = 'Changes in source_range values are reflected in target_range1')\n", + "caption = widgets.Label(value = 'Changes in source_range values are reflected in target_range1')\n", "\n", "source_range = widgets.IntSlider(description='Source range')\n", "target_range1 = widgets.IntSlider(description='Target range ')\n", From e13807711e6b919ee45e2bd4bd8922a838ff79f6 Mon Sep 17 00:00:00 2001 From: Cecilia Cisneros Date: Thu, 20 Apr 2017 11:13:34 -0500 Subject: [PATCH 07/11] change deep to deeper --- Iterators and Generators.ipynb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Iterators and Generators.ipynb b/Iterators and Generators.ipynb index e97fbd9..ee23bd2 100644 --- a/Iterators and Generators.ipynb +++ b/Iterators and Generators.ipynb @@ -15,7 +15,7 @@ "\n", "We've touch on this topic in the past when discussing the range() function in Python 2 and the similar xrange(), with the difference being the xrange() was a generator.\n", "\n", - "Lets explore a little deep. We've learned how to create functions with **def** and the **return** statement. Generator functions allow us to write a function that can send back a value and then later resume to pick up where it left off. This type of function is a generator in Python, allowing us to generate a sequence of values over time. The main difference in syntax will be the use of a **yield** statement.\n", + "Lets explore a little deeper. We've learned how to create functions with **def** and the **return** statement. Generator functions allow us to write a function that can send back a value and then later resume to pick up where it left off. This type of function is a generator in Python, allowing us to generate a sequence of values over time. The main difference in syntax will be the use of a **yield** statement.\n", "\n", "In most aspects, a generator function will appear very similar to a normal function. The main difference is when a generator function is compiled they become an object that support an iteration protocol. That means when they are called in your code the don't actually return a value and then exit, the generator functions will automatically suspend and resume their execution and state around the last point of value generation. The main advantage here is that instead of having to compute an entire series of values upfront and the generator functions can be suspended, this feature is known as *state suspension*.\n", "\n", From e4ec1b7f242c3032c869ad73c8d2581bea7022a5 Mon Sep 17 00:00:00 2001 From: Marci Date: Thu, 25 May 2017 15:00:52 -0700 Subject: [PATCH 08/11] fix numbers table --- .ipynb_checkpoints/Numbers-checkpoint.ipynb | 34 ++++++++++++++------- Numbers.ipynb | 30 ++++++++++++------ 2 files changed, 44 insertions(+), 20 deletions(-) diff --git a/.ipynb_checkpoints/Numbers-checkpoint.ipynb b/.ipynb_checkpoints/Numbers-checkpoint.ipynb index b901e0d..4927e95 100644 --- a/.ipynb_checkpoints/Numbers-checkpoint.ipynb +++ b/.ipynb_checkpoints/Numbers-checkpoint.ipynb @@ -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", @@ -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": [ "\n", " \n", "\n", @@ -44,7 +49,13 @@ "\n", "\n", "
Numbers in Python
\n", - " \n", + " " + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ " \n", " \n", "Now let's start with some basic arithmetic." @@ -155,7 +166,7 @@ "source": [ "### Python 3 Alert!\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", @@ -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!" ] }, { @@ -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, diff --git a/Numbers.ipynb b/Numbers.ipynb index eb0871e..4927e95 100644 --- a/Numbers.ipynb +++ b/Numbers.ipynb @@ -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", @@ -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": [ "\n", " \n", "\n", @@ -44,7 +49,13 @@ "\n", "\n", "
Numbers in Python
\n", - " \n", + " " + ] + }, + { + "cell_type": "markdown", + "metadata": {}, + "source": [ " \n", " \n", "Now let's start with some basic arithmetic." @@ -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, From c3284d1793775e3350a9d333639044107c7df7e3 Mon Sep 17 00:00:00 2001 From: Marci Date: Thu, 25 May 2017 15:04:38 -0700 Subject: [PATCH 09/11] fix numbers table --- .ipynb_checkpoints/Numbers-checkpoint.ipynb | 8 +++----- Numbers.ipynb | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.ipynb_checkpoints/Numbers-checkpoint.ipynb b/.ipynb_checkpoints/Numbers-checkpoint.ipynb index 4927e95..11cf319 100644 --- a/.ipynb_checkpoints/Numbers-checkpoint.ipynb +++ b/.ipynb_checkpoints/Numbers-checkpoint.ipynb @@ -38,18 +38,16 @@ "metadata": {}, "source": [ "\n", - " \n", "\n", " \n", "\n", - " \n", "\n", + " \n", "\n", - " \n", "\n", + " \n", "\n", - "
Numbers in Python
Examples Number \"Type\"
1,2,-5,1000 Integers
1,2,-5,1000 Integers
1.2,-0.5,2e2,3E2 Floating-point numbers
1.2,-0.5,2e2,3E2 Floating-point numbers
\n", - " " + " " ] }, { diff --git a/Numbers.ipynb b/Numbers.ipynb index 4927e95..11cf319 100644 --- a/Numbers.ipynb +++ b/Numbers.ipynb @@ -38,18 +38,16 @@ "metadata": {}, "source": [ "\n", - " \n", "\n", " \n", "\n", - " \n", "\n", + " \n", "\n", - " \n", "\n", + " \n", "\n", - "
Numbers in Python
Examples Number \"Type\"
1,2,-5,1000 Integers
1,2,-5,1000 Integers
1.2,-0.5,2e2,3E2 Floating-point numbers
1.2,-0.5,2e2,3E2 Floating-point numbers
\n", - " " + " " ] }, { From 65f792bc88fea4da810ad3034f30cbdb78178efe Mon Sep 17 00:00:00 2001 From: Marci Date: Thu, 25 May 2017 15:07:05 -0700 Subject: [PATCH 10/11] second attempte to fix numbers table --- .ipynb_checkpoints/Numbers-checkpoint.ipynb | 13 +++++++++---- Numbers.ipynb | 13 +++++++++---- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.ipynb_checkpoints/Numbers-checkpoint.ipynb b/.ipynb_checkpoints/Numbers-checkpoint.ipynb index 11cf319..9306111 100644 --- a/.ipynb_checkpoints/Numbers-checkpoint.ipynb +++ b/.ipynb_checkpoints/Numbers-checkpoint.ipynb @@ -37,15 +37,20 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "\n", + "
\n", "\n", - " \n", + " \n", + " \n", "\n", + "\n", "\n", - " \n", + " \n", + " \n", "\n", + "\n", "\n", - " \n", + " \n", + " \n", "\n", "
Examples Number \"Type\"ExamplesNumber \"Type\"
1,2,-5,1000 Integers1,2,-5,1000Integers
1.2,-0.5,2e2,3E2 Floating-point numbers1.2,-0.5,2e2,3E2Floating-point numbers
" ] diff --git a/Numbers.ipynb b/Numbers.ipynb index 11cf319..9306111 100644 --- a/Numbers.ipynb +++ b/Numbers.ipynb @@ -37,15 +37,20 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "\n", + "
\n", "\n", - " \n", + " \n", + " \n", "\n", + "\n", "\n", - " \n", + " \n", + " \n", "\n", + "\n", "\n", - " \n", + " \n", + " \n", "\n", "
Examples Number \"Type\"ExamplesNumber \"Type\"
1,2,-5,1000 Integers1,2,-5,1000Integers
1.2,-0.5,2e2,3E2 Floating-point numbers1.2,-0.5,2e2,3E2Floating-point numbers
" ] From 6b5531e8087439a5e3739adabe2ea637d71f0551 Mon Sep 17 00:00:00 2001 From: Pierian-Data Date: Thu, 6 Jul 2017 16:02:54 -0700 Subject: [PATCH 11/11] sorted list fix --- ... Assessment Test-Solution-checkpoint.ipynb | 33 ++++++++++--------- ...tructures Assessment Test-checkpoint.ipynb | 17 +++++----- ... Structures Assessment Test-Solution.ipynb | 21 ++++++------ ... and Data Structures Assessment Test.ipynb | 7 ++-- 4 files changed, 41 insertions(+), 37 deletions(-) diff --git a/.ipynb_checkpoints/Objects and Data Structures Assessment Test-Solution-checkpoint.ipynb b/.ipynb_checkpoints/Objects and Data Structures Assessment Test-Solution-checkpoint.ipynb index d24a688..a3e732c 100644 --- a/.ipynb_checkpoints/Objects and Data Structures Assessment Test-Solution-checkpoint.ipynb +++ b/.ipynb_checkpoints/Objects and Data Structures Assessment Test-Solution-checkpoint.ipynb @@ -13,7 +13,7 @@ "collapsed": true }, "source": [ - "## Test your knowledege. \n", + "## Test your knowledge. \n", "\n", "** Answer the following questions **" ] @@ -111,7 +111,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "**Answer: Because Python 2 performs classic division for integers. Use floats to perform true divsion. For example:\n", + "**Answer: Because Python 2 performs classic division for integers. Use floats to perform true division. For example:\n", "2.0/3**" ] }, @@ -270,7 +270,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Given the string 'hello' give an index commadn that returns 'e'. Use the code below:" + "Given the string 'hello' give an index command that returns 'e'. Use the code below:" ] }, { @@ -506,18 +506,18 @@ }, { "cell_type": "code", - "execution_count": 33, + "execution_count": 1, "metadata": { "collapsed": true }, "outputs": [], "source": [ - "l = [3,4,5,5,6]" + "l = [5,3,4,6,1]" ] }, { "cell_type": "code", - "execution_count": 38, + "execution_count": 2, "metadata": { "collapsed": false }, @@ -525,10 +525,10 @@ { "data": { "text/plain": [ - "[3, 4, 5, 5, 6]" + "[1, 3, 4, 5, 6]" ] }, - "execution_count": 38, + "execution_count": 2, "metadata": {}, "output_type": "execute_result" } @@ -540,7 +540,7 @@ }, { "cell_type": "code", - "execution_count": 40, + "execution_count": 3, "metadata": { "collapsed": false }, @@ -548,10 +548,10 @@ { "data": { "text/plain": [ - "[3, 4, 5, 5, 6]" + "[1, 3, 4, 5, 6]" ] }, - "execution_count": 40, + "execution_count": 3, "metadata": {}, "output_type": "execute_result" } @@ -688,7 +688,7 @@ "outputs": [], "source": [ "# This will be hard and annoying!\n", - "d = {'k1':[1,2,{'k2':['this is tricky',{'toughie':[1,2,['hello']]}]}]}" + "d = {'k1':[1,2,{'k2':['this is tricky',{'tough':[1,2,['hello']]}]}]}" ] }, { @@ -711,7 +711,7 @@ ], "source": [ "# Phew\n", - "d['k1'][2]['k2'][1]['toughie'][2][0]" + "d['k1'][2]['k2'][1]['tough'][2][0]" ] }, { @@ -739,7 +739,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "What is the major difference betwen tuples and lists?" + "What is the major difference between tuples and lists?" ] }, { @@ -1047,8 +1047,9 @@ } ], "metadata": { + "anaconda-cloud": {}, "kernelspec": { - "display_name": "Python 3", + "display_name": "Python [default]", "language": "python", "name": "python3" }, @@ -1062,7 +1063,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.5.1" + "version": "3.5.3" } }, "nbformat": 4, diff --git a/.ipynb_checkpoints/Objects and Data Structures Assessment Test-checkpoint.ipynb b/.ipynb_checkpoints/Objects and Data Structures Assessment Test-checkpoint.ipynb index 36d77fd..eda6242 100644 --- a/.ipynb_checkpoints/Objects and Data Structures Assessment Test-checkpoint.ipynb +++ b/.ipynb_checkpoints/Objects and Data Structures Assessment Test-checkpoint.ipynb @@ -13,7 +13,7 @@ "collapsed": true }, "source": [ - "## Test your knowledege. \n", + "## Test your knowledge. \n", "\n", "** Answer the following questions **" ] @@ -141,7 +141,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Given the string 'hello' give an index commadn that returns 'e'. Use the code below:" + "Given the string 'hello' give an index command that returns 'e'. Use the code below:" ] }, { @@ -213,7 +213,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Build this list [0,0,0] two seperate ways." + "Build this list [0,0,0] two separate ways." ] }, { @@ -258,7 +258,7 @@ }, "outputs": [], "source": [ - "l = [3,4,5,5,6]" + "l = [5,3,4,6,1]" ] }, { @@ -322,7 +322,7 @@ "outputs": [], "source": [ "# This will be hard and annoying!\n", - "d = {'k1':[1,2,{'k2':['this is tricky',{'toughie':[1,2,['hello']]}]}]}" + "d = {'k1':[1,2,{'k2':['this is tricky',{'tough':[1,2,['hello']]}]}]}" ] }, { @@ -348,7 +348,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "What is the major difference betwen tuples and lists?" + "What is the major difference between tuples and lists?" ] }, { @@ -558,8 +558,9 @@ } ], "metadata": { + "anaconda-cloud": {}, "kernelspec": { - "display_name": "Python 3", + "display_name": "Python [default]", "language": "python", "name": "python3" }, @@ -573,7 +574,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.5.1" + "version": "3.5.3" } }, "nbformat": 4, diff --git a/Objects and Data Structures Assessment Test-Solution.ipynb b/Objects and Data Structures Assessment Test-Solution.ipynb index 5a469d3..a3e732c 100644 --- a/Objects and Data Structures Assessment Test-Solution.ipynb +++ b/Objects and Data Structures Assessment Test-Solution.ipynb @@ -506,18 +506,18 @@ }, { "cell_type": "code", - "execution_count": 33, + "execution_count": 1, "metadata": { "collapsed": true }, "outputs": [], "source": [ - "l = [3,4,5,5,6]" + "l = [5,3,4,6,1]" ] }, { "cell_type": "code", - "execution_count": 38, + "execution_count": 2, "metadata": { "collapsed": false }, @@ -525,10 +525,10 @@ { "data": { "text/plain": [ - "[3, 4, 5, 5, 6]" + "[1, 3, 4, 5, 6]" ] }, - "execution_count": 38, + "execution_count": 2, "metadata": {}, "output_type": "execute_result" } @@ -540,7 +540,7 @@ }, { "cell_type": "code", - "execution_count": 40, + "execution_count": 3, "metadata": { "collapsed": false }, @@ -548,10 +548,10 @@ { "data": { "text/plain": [ - "[3, 4, 5, 5, 6]" + "[1, 3, 4, 5, 6]" ] }, - "execution_count": 40, + "execution_count": 3, "metadata": {}, "output_type": "execute_result" } @@ -1047,8 +1047,9 @@ } ], "metadata": { + "anaconda-cloud": {}, "kernelspec": { - "display_name": "Python 3", + "display_name": "Python [default]", "language": "python", "name": "python3" }, @@ -1062,7 +1063,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.5.1" + "version": "3.5.3" } }, "nbformat": 4, diff --git a/Objects and Data Structures Assessment Test.ipynb b/Objects and Data Structures Assessment Test.ipynb index f96a009..eda6242 100644 --- a/Objects and Data Structures Assessment Test.ipynb +++ b/Objects and Data Structures Assessment Test.ipynb @@ -258,7 +258,7 @@ }, "outputs": [], "source": [ - "l = [3,4,5,5,6]" + "l = [5,3,4,6,1]" ] }, { @@ -558,8 +558,9 @@ } ], "metadata": { + "anaconda-cloud": {}, "kernelspec": { - "display_name": "Python 3", + "display_name": "Python [default]", "language": "python", "name": "python3" }, @@ -573,7 +574,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.5.1" + "version": "3.5.3" } }, "nbformat": 4,