From ea784ea9113070d6ce8cba4339b7929f3668d956 Mon Sep 17 00:00:00 2001 From: AmineBellahsen <47125503+AmineBellahsen@users.noreply.github.com> Date: Wed, 28 Oct 2020 16:06:38 -0400 Subject: [PATCH 1/3] Add files via upload Modified step 14 & step 16. Item price already takes into account the quantity. --- .../Chipotle/Exercise_with_Solutions.ipynb | 191 ++++++++++-------- 1 file changed, 102 insertions(+), 89 deletions(-) diff --git a/01_Getting_&_Knowing_Your_Data/Chipotle/Exercise_with_Solutions.ipynb b/01_Getting_&_Knowing_Your_Data/Chipotle/Exercise_with_Solutions.ipynb index 32d1e7df..857f7333 100644 --- a/01_Getting_&_Knowing_Your_Data/Chipotle/Exercise_with_Solutions.ipynb +++ b/01_Getting_&_Knowing_Your_Data/Chipotle/Exercise_with_Solutions.ipynb @@ -22,9 +22,7 @@ { "cell_type": "code", "execution_count": 1, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [], "source": [ "import pandas as pd\n", @@ -48,9 +46,7 @@ { "cell_type": "code", "execution_count": 2, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [], "source": [ "url = 'https://raw.githubusercontent.com/justmarkham/DAT8/master/data/chipotle.tsv'\n", @@ -69,7 +65,6 @@ "cell_type": "code", "execution_count": 3, "metadata": { - "collapsed": false, "scrolled": false }, "outputs": [ @@ -77,6 +72,19 @@ "data": { "text/html": [ "
\n", + "\n", "\n", " \n", " \n", @@ -218,9 +226,7 @@ { "cell_type": "code", "execution_count": 4, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -242,9 +248,7 @@ { "cell_type": "code", "execution_count": 5, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "name": "stdout", @@ -253,13 +257,15 @@ "\n", "RangeIndex: 4622 entries, 0 to 4621\n", "Data columns (total 5 columns):\n", - "order_id 4622 non-null int64\n", - "quantity 4622 non-null int64\n", - "item_name 4622 non-null object\n", - "choice_description 3376 non-null object\n", - "item_price 4622 non-null object\n", + " # Column Non-Null Count Dtype \n", + "--- ------ -------------- ----- \n", + " 0 order_id 4622 non-null int64 \n", + " 1 quantity 4622 non-null int64 \n", + " 2 item_name 4622 non-null object\n", + " 3 choice_description 3376 non-null object\n", + " 4 item_price 4622 non-null object\n", "dtypes: int64(2), object(3)\n", - "memory usage: 180.6+ KB\n" + "memory usage: 180.7+ KB\n" ] } ], @@ -279,9 +285,7 @@ { "cell_type": "code", "execution_count": 6, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -308,15 +312,13 @@ { "cell_type": "code", "execution_count": 7, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "Index([u'order_id', u'quantity', u'item_name', u'choice_description',\n", - " u'item_price'],\n", + "Index(['order_id', 'quantity', 'item_name', 'choice_description',\n", + " 'item_price'],\n", " dtype='object')" ] }, @@ -339,9 +341,7 @@ { "cell_type": "code", "execution_count": 8, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -368,14 +368,25 @@ { "cell_type": "code", "execution_count": 9, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { "text/html": [ "
\n", + "\n", "
\n", " \n", " \n", @@ -427,14 +438,25 @@ { "cell_type": "code", "execution_count": 10, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { "text/html": [ "
\n", + "\n", "
\n", " \n", " \n", @@ -486,14 +508,25 @@ { "cell_type": "code", "execution_count": 11, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { "text/html": [ "
\n", + "\n", "
\n", " \n", " \n", @@ -545,9 +578,7 @@ { "cell_type": "code", "execution_count": 12, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -582,9 +613,7 @@ { "cell_type": "code", "execution_count": 13, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -611,9 +640,7 @@ { "cell_type": "code", "execution_count": 14, - "metadata": { - "collapsed": true - }, + "metadata": {}, "outputs": [], "source": [ "dollarizer = lambda x: float(x[1:-1])\n", @@ -630,9 +657,7 @@ { "cell_type": "code", "execution_count": 15, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -658,21 +683,19 @@ }, { "cell_type": "code", - "execution_count": 22, - "metadata": { - "collapsed": false - }, + "execution_count": 16, + "metadata": {}, "outputs": [ { "name": "stdout", "output_type": "stream", "text": [ - "Revenue was: $39237.02\n" + "Revenue was: $34500.16\n" ] } ], "source": [ - "revenue = (chipo['quantity']* chipo['item_price']).sum()\n", + "revenue = chipo['item_price'].sum()\n", "\n", "print('Revenue was: $' + str(np.round(revenue,2)))" ] @@ -686,10 +709,8 @@ }, { "cell_type": "code", - "execution_count": 23, - "metadata": { - "collapsed": false - }, + "execution_count": 17, + "metadata": {}, "outputs": [ { "data": { @@ -697,7 +718,7 @@ "1834" ] }, - "execution_count": 23, + "execution_count": 17, "metadata": {}, "output_type": "execute_result" } @@ -716,44 +737,38 @@ }, { "cell_type": "code", - "execution_count": 31, - "metadata": { - "collapsed": false - }, + "execution_count": 18, + "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "21.394231188658654" + "18.81142857142869" ] }, - "execution_count": 31, + "execution_count": 18, "metadata": {}, "output_type": "execute_result" } ], "source": [ "# Solution 1\n", - "\n", - "chipo['revenue'] = chipo['quantity'] * chipo['item_price']\n", "order_grouped = chipo.groupby(by=['order_id']).sum()\n", - "order_grouped.mean()['revenue']" + "order_grouped.mean()['item_price']" ] }, { "cell_type": "code", - "execution_count": 32, - "metadata": { - "collapsed": false - }, + "execution_count": 19, + "metadata": {}, "outputs": [ { "data": { "text/plain": [ - "21.394231188658654" + "18.81142857142869" ] }, - "execution_count": 32, + "execution_count": 19, "metadata": {}, "output_type": "execute_result" } @@ -761,7 +776,7 @@ "source": [ "# Solution 2\n", "\n", - "chipo.groupby(by=['order_id']).sum().mean()['revenue']" + "chipo.groupby(by=['order_id']).sum().mean()['item_price']" ] }, { @@ -773,10 +788,8 @@ }, { "cell_type": "code", - "execution_count": 33, - "metadata": { - "collapsed": false - }, + "execution_count": 20, + "metadata": {}, "outputs": [ { "data": { @@ -784,7 +797,7 @@ "50" ] }, - "execution_count": 33, + "execution_count": 20, "metadata": {}, "output_type": "execute_result" } @@ -797,23 +810,23 @@ "metadata": { "anaconda-cloud": {}, "kernelspec": { - "display_name": "Python [default]", + "display_name": "Python 3", "language": "python", - "name": "python2" + "name": "python3" }, "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.12" + "pygments_lexer": "ipython3", + "version": "3.6.10" } }, "nbformat": 4, - "nbformat_minor": 0 + "nbformat_minor": 1 } From 971c7db3aac878683ff7b2ff206da1c9cda989ad Mon Sep 17 00:00:00 2001 From: AmineBellahsen <47125503+AmineBellahsen@users.noreply.github.com> Date: Wed, 28 Oct 2020 16:21:26 -0400 Subject: [PATCH 2/3] Corrected answer values in Chipotle problem. --- .../Chipotle/Solutions.ipynb | 128 +++++------------- 1 file changed, 35 insertions(+), 93 deletions(-) diff --git a/01_Getting_&_Knowing_Your_Data/Chipotle/Solutions.ipynb b/01_Getting_&_Knowing_Your_Data/Chipotle/Solutions.ipynb index b497173b..48a57a25 100644 --- a/01_Getting_&_Knowing_Your_Data/Chipotle/Solutions.ipynb +++ b/01_Getting_&_Knowing_Your_Data/Chipotle/Solutions.ipynb @@ -22,9 +22,7 @@ { "cell_type": "code", "execution_count": 1, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [], "source": [] }, @@ -45,9 +43,7 @@ { "cell_type": "code", "execution_count": 2, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [], "source": [] }, @@ -62,7 +58,6 @@ "cell_type": "code", "execution_count": 3, "metadata": { - "collapsed": false, "scrolled": false }, "outputs": [ @@ -209,9 +204,7 @@ { "cell_type": "code", "execution_count": 4, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -232,9 +225,7 @@ { "cell_type": "code", "execution_count": 5, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "name": "stdout", @@ -268,9 +259,7 @@ { "cell_type": "code", "execution_count": 6, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -295,9 +284,7 @@ { "cell_type": "code", "execution_count": 7, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -324,9 +311,7 @@ { "cell_type": "code", "execution_count": 8, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -351,9 +336,7 @@ { "cell_type": "code", "execution_count": 9, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -405,9 +388,7 @@ { "cell_type": "code", "execution_count": 10, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -459,9 +440,7 @@ { "cell_type": "code", "execution_count": 11, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -513,9 +492,7 @@ { "cell_type": "code", "execution_count": 12, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -547,9 +524,7 @@ { "cell_type": "code", "execution_count": 13, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -590,9 +565,7 @@ { "cell_type": "code", "execution_count": 15, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -614,23 +587,6 @@ "### Step 14. How much was the revenue for the period in the dataset?" ] }, - { - "cell_type": "code", - "execution_count": 22, - "metadata": { - "collapsed": false - }, - "outputs": [ - { - "name": "stdout", - "output_type": "stream", - "text": [ - "Revenue was: $39237.02\n" - ] - } - ], - "source": [] - }, { "cell_type": "markdown", "metadata": {}, @@ -641,9 +597,7 @@ { "cell_type": "code", "execution_count": 23, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -667,20 +621,15 @@ }, { "cell_type": "code", - "execution_count": 31, - "metadata": { - "collapsed": false - }, + "execution_count": 2, + "metadata": {}, "outputs": [ { - "data": { - "text/plain": [ - "21.394231188658654" - ] - }, - "execution_count": 31, - "metadata": {}, - "output_type": "execute_result" + "name": "stdout", + "output_type": "stream", + "text": [ + "18.81142857142869\n" + ] } ], "source": [ @@ -690,20 +639,15 @@ }, { "cell_type": "code", - "execution_count": 32, - "metadata": { - "collapsed": false - }, + "execution_count": 3, + "metadata": {}, "outputs": [ { - "data": { - "text/plain": [ - "21.394231188658654" - ] - }, - "execution_count": 32, - "metadata": {}, - "output_type": "execute_result" + "name": "stdout", + "output_type": "stream", + "text": [ + "18.81142857142869\n" + ] } ], "source": [ @@ -721,9 +665,7 @@ { "cell_type": "code", "execution_count": 33, - "metadata": { - "collapsed": false - }, + "metadata": {}, "outputs": [ { "data": { @@ -742,23 +684,23 @@ "metadata": { "anaconda-cloud": {}, "kernelspec": { - "display_name": "Python [default]", + "display_name": "Python 3", "language": "python", - "name": "python2" + "name": "python3" }, "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.12" + "pygments_lexer": "ipython3", + "version": "3.6.10" } }, "nbformat": 4, - "nbformat_minor": 0 + "nbformat_minor": 1 } From a5b17debd1139b8e36db0e494b8282932393b83c Mon Sep 17 00:00:00 2001 From: AmineBellahsen <47125503+AmineBellahsen@users.noreply.github.com> Date: Wed, 28 Oct 2020 16:22:45 -0400 Subject: [PATCH 3/3] Corrected output values for Chipotle problem. --- .../Chipotle/Solutions.ipynb | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/01_Getting_&_Knowing_Your_Data/Chipotle/Solutions.ipynb b/01_Getting_&_Knowing_Your_Data/Chipotle/Solutions.ipynb index 48a57a25..a07c406b 100644 --- a/01_Getting_&_Knowing_Your_Data/Chipotle/Solutions.ipynb +++ b/01_Getting_&_Knowing_Your_Data/Chipotle/Solutions.ipynb @@ -587,6 +587,23 @@ "### Step 14. How much was the revenue for the period in the dataset?" ] }, + { + "cell_type": "code", + "execution_count": 1, + "metadata": {}, + "outputs": [ + { + "name": "stdout", + "output_type": "stream", + "text": [ + "Revenue was: $34500.16\n" + ] + } + ], + "source": [ + "print(\"Revenue was: $34500.16\")" + ] + }, { "cell_type": "markdown", "metadata": {},