From 349a658a956329b626fb25a4ca97ad0fbf4b9082 Mon Sep 17 00:00:00 2001 From: Max Alletsee Date: Thu, 2 Apr 2020 07:38:12 +0200 Subject: [PATCH 1/2] Name of dataset missing --- .../Pokemon/Exercises-with-solutions-and-code.ipynb | 2 +- 08_Creating_Series_and_DataFrames/Pokemon/Exercises.ipynb | 2 +- 08_Creating_Series_and_DataFrames/Pokemon/Solutions.ipynb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/08_Creating_Series_and_DataFrames/Pokemon/Exercises-with-solutions-and-code.ipynb b/08_Creating_Series_and_DataFrames/Pokemon/Exercises-with-solutions-and-code.ipynb index 52382727c..3345139a1 100644 --- a/08_Creating_Series_and_DataFrames/Pokemon/Exercises-with-solutions-and-code.ipynb +++ b/08_Creating_Series_and_DataFrames/Pokemon/Exercises-with-solutions-and-code.ipynb @@ -58,7 +58,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "### Step 3. Assign it to a variable called " + "### Step 3. Assign it to a variable called pokemon" ] }, { diff --git a/08_Creating_Series_and_DataFrames/Pokemon/Exercises.ipynb b/08_Creating_Series_and_DataFrames/Pokemon/Exercises.ipynb index 8a3751399..360204628 100644 --- a/08_Creating_Series_and_DataFrames/Pokemon/Exercises.ipynb +++ b/08_Creating_Series_and_DataFrames/Pokemon/Exercises.ipynb @@ -49,7 +49,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "### Step 3. Assign it to a variable called " + "### Step 3. Assign it to a variable called pokemon" ] }, { diff --git a/08_Creating_Series_and_DataFrames/Pokemon/Solutions.ipynb b/08_Creating_Series_and_DataFrames/Pokemon/Solutions.ipynb index 3a0cebbf4..e1f9e70fe 100644 --- a/08_Creating_Series_and_DataFrames/Pokemon/Solutions.ipynb +++ b/08_Creating_Series_and_DataFrames/Pokemon/Solutions.ipynb @@ -49,7 +49,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "### Step 3. Assign it to a variable called " + "### Step 3. Assign it to a variable called pokemon" ] }, { From 4b999213b417742e0ab24bb7be17cf258d78d2d7 Mon Sep 17 00:00:00 2001 From: Max Alletsee Date: Thu, 2 Apr 2020 07:55:27 +0200 Subject: [PATCH 2/2] Solution file didn't show solution --- .../Pokemon/Solutions.ipynb | 236 +++++++++++++++++- 1 file changed, 226 insertions(+), 10 deletions(-) diff --git a/08_Creating_Series_and_DataFrames/Pokemon/Solutions.ipynb b/08_Creating_Series_and_DataFrames/Pokemon/Solutions.ipynb index e1f9e70fe..a8cc38601 100644 --- a/08_Creating_Series_and_DataFrames/Pokemon/Solutions.ipynb +++ b/08_Creating_Series_and_DataFrames/Pokemon/Solutions.ipynb @@ -22,7 +22,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 2, "metadata": { "collapsed": false }, @@ -38,7 +38,7 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 3, "metadata": { "collapsed": true }, @@ -54,11 +54,76 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 5, "metadata": { "collapsed": false }, - "outputs": [], + "outputs": [ + { + "data": { + "text/html": [ + "
\n", + "\n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + "
evolutionhpnamepokedextype
0Ivysaur45Bulbasauryesgrass
1Charmeleon39Charmandernofire
2Wartortle44Squirtleyeswater
3Metapod45Caterpienobug
\n", + "
" + ], + "text/plain": [ + " evolution hp name pokedex type\n", + "0 Ivysaur 45 Bulbasaur yes grass\n", + "1 Charmeleon 39 Charmander no fire\n", + "2 Wartortle 44 Squirtle yes water\n", + "3 Metapod 45 Caterpie no bug" + ] + }, + "execution_count": 5, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [] }, { @@ -70,11 +135,76 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 8, "metadata": { "collapsed": false }, - "outputs": [], + "outputs": [ + { + "data": { + "text/html": [ + "
\n", + "\n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + "
nametypehpevolutionpokedex
0Bulbasaurgrass45Ivysauryes
1Charmanderfire39Charmeleonno
2Squirtlewater44Wartortleyes
3Caterpiebug45Metapodno
\n", + "
" + ], + "text/plain": [ + " name type hp evolution pokedex\n", + "0 Bulbasaur grass 45 Ivysaur yes\n", + "1 Charmander fire 39 Charmeleon no\n", + "2 Squirtle water 44 Wartortle yes\n", + "3 Caterpie bug 45 Metapod no" + ] + }, + "execution_count": 8, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [] }, { @@ -86,11 +216,81 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 13, "metadata": { "collapsed": false }, - "outputs": [], + "outputs": [ + { + "data": { + "text/html": [ + "
\n", + "\n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + " \n", + "
nametypehpevolutionpokedexplace
0Bulbasaurgrass45Ivysauryespark
1Charmanderfire39Charmeleonnostreet
2Squirtlewater44Wartortleyeslake
3Caterpiebug45Metapodnoforest
\n", + "
" + ], + "text/plain": [ + " name type hp evolution pokedex place\n", + "0 Bulbasaur grass 45 Ivysaur yes park\n", + "1 Charmander fire 39 Charmeleon no street\n", + "2 Squirtle water 44 Wartortle yes lake\n", + "3 Caterpie bug 45 Metapod no forest" + ] + }, + "execution_count": 13, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [] }, { @@ -102,11 +302,27 @@ }, { "cell_type": "code", - "execution_count": null, + "execution_count": 9, "metadata": { "collapsed": false }, - "outputs": [], + "outputs": [ + { + "data": { + "text/plain": [ + "name object\n", + "type object\n", + "hp int64\n", + "evolution object\n", + "pokedex object\n", + "dtype: object" + ] + }, + "execution_count": 9, + "metadata": {}, + "output_type": "execute_result" + } + ], "source": [] }, {