Merge pull request #21 from kmather73/master

Fixed an indentation error in ch04
wesm · Sep 18, 2015 · d65da18 · d65da18
2 parents 03d0784 + fd21ddd
commit d65da18
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 39 deletions.
diff --git a/ch02.ipynb b/ch02.ipynb
@@ -547,11 +547,12 @@
      "collapsed": false,
      "input": [
       "import pandas as pd\n",
+      "import os\n"
       "encoding = 'latin1'\n",
       "\n",
-      "upath = os.path.expanduser('movielens/ml-1m/users.dat')\n",
-      "rpath = os.path.expanduser('movielens/ml-1m/ratings.dat')\n",
-      "mpath = os.path.expanduser('movielens/ml-1m/movies.dat')\n",
+      "upath = os.path.expanduser('ch02/movielens/users.dat')\n",
+      "rpath = os.path.expanduser('ch02/movielens/ratings.dat')\n",
+      "mpath = os.path.expanduser('ch02/movielens/movies.dat')\n",
       "\n",
       "unames = ['user_id', 'gender', 'age', 'occupation', 'zip']\n",
       "rnames = ['user_id', 'movie_id', 'rating', 'timestamp']\n",
@@ -630,8 +631,8 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "mean_ratings = data.pivot_table('rating', rows='title',\n",
-      "                                cols='gender', aggfunc='mean')\n",
+      "mean_ratings = data.pivot_table('rating', index='title',\n",
+      "                                columns='gender', aggfunc='mean')\n",
       "mean_ratings[:5]"
      ],
      "language": "python",
@@ -800,7 +801,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "!head -n 10 baby_names/names/yob1880.txt"
+      "!head -n 10 ch02/names/yob1880.txt"
      ],
      "language": "python",
      "metadata": {},
@@ -811,7 +812,7 @@
      "collapsed": false,
      "input": [
       "import pandas as pd\n",
-      "names1880 = pd.read_csv('baby_names/names/yob1880.txt', names=['name', 'sex', 'births'])\n",
+      "names1880 = pd.read_csv('ch02/names/yob1880.txt', names=['name', 'sex', 'births'])\n",
       "names1880"
      ],
      "language": "python",
@@ -856,28 +857,8 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "names = pd.read_pickle('baby_names/all_names')"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "names"
-     ],
-     "language": "python",
-     "metadata": {},
-     "outputs": []
-    },
-    {
-     "cell_type": "code",
-     "collapsed": false,
-     "input": [
-      "total_births = names.pivot_table('births', rows='year',\n",
-      "                                 cols='sex', aggfunc=sum)"
+      "total_births = names.pivot_table('births', index='year',\n",
+      "                                 columns='sex', aggfunc=sum)"
      ],
      "language": "python",
      "metadata": {},
@@ -1008,7 +989,7 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "total_births = top1000.pivot_table('births', rows='year', cols='name',\n",
+      "total_births = top1000.pivot_table('births', index='year', columns='name',\n",
       "                                   aggfunc=sum)\n",
       "total_births"
      ],
@@ -1050,8 +1031,8 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "table = top1000.pivot_table('prop', rows='year',\n",
-      "                            cols='sex', aggfunc=sum)\n",
+      "table = top1000.pivot_table('prop', index='year',\n",
+      "                            columns='sex', aggfunc=sum)\n",
       "table.plot(title='Sum of table1000.prop by year and sex',\n",
       "           yticks=np.linspace(0, 1.2, 13), xticks=range(1880, 2020, 10))"
      ],
@@ -1160,8 +1141,8 @@
       "last_letters = names.name.map(get_last_letter)\n",
       "last_letters.name = 'last_letter'\n",
       "\n",
-      "table = names.pivot_table('births', rows=last_letters,\n",
-      "                          cols=['sex', 'year'], aggfunc=sum)"
+      "table = names.pivot_table('births', index=last_letters,\n",
+      "                          columns=['sex', 'year'], aggfunc=sum)"
      ],
      "language": "python",
      "metadata": {},
@@ -1173,6 +1154,15 @@
      "input": [
       "subtable = table.reindex(columns=[1910, 1960, 2010], level='year')\n",
       "subtable.head()\n",
+     ],
+     "language": "python",
+     "metadata": {},
+     "outputs": []
+    },
+    {
+     "cell_type": "code",
+     "collapsed": false,
+     "input": [
       "subtable.sum()"
      ],
      "language": "python",
@@ -1283,8 +1273,8 @@
      "cell_type": "code",
      "collapsed": false,
      "input": [
-      "table = filtered.pivot_table('births', rows='year',\n",
-      "                             cols='sex', aggfunc='sum')\n",
+      "table = filtered.pivot_table('births', index='year',\n",
+      "                             columns='sex', aggfunc='sum')\n",
       "table = table.div(table.sum(1), axis=0)\n",
       "table.tail()"
      ],
@@ -1316,4 +1306,4 @@
    "metadata": {}
   }
  ]
-}
+}
diff --git a/ch04.ipynb b/ch04.ipynb
@@ -995,7 +995,7 @@
      "collapsed": false,
      "input": [
       "names = np.array(['Bob', 'Joe', 'Will', 'Bob', 'Will', 'Joe', 'Joe'])\n",
-      "    np.unique(names)\n",
+      "np.unique(names)\n",
       "ints = np.array([3, 3, 3, 2, 2, 1, 1, 4, 4])\n",
       "np.unique(ints)"
      ],
@@ -1350,4 +1350,4 @@
    "metadata": {}
   }
  ]
-}
+}