Merge branch 'fix-chap06-wind-stats' of https://github.com/TakaakiFuruse/pandas_exercises into TakaakiFuruse-fix-chap06-wind-stats

guipsamora · guipsamora · commit 2edb63d497e3 · 2018-08-15T09:55:47.000+02:00
diff --git a/06_Stats/Wind_Stats/Exercises_with_solutions.ipynb b/06_Stats/Wind_Stats/Exercises_with_solutions.ipynb
@@ -87,7 +87,7 @@
    "cell_type": "markdown",
    "metadata": {},
    "source": [
-    "### Step 2. Import the dataset from this [address](https://github.com/guipsamora/pandas_exercises/blob/master/Stats/Wind_Stats/wind.data)"
+    "### Step 2. Import the dataset from this [address](https://github.com/guipsamora/pandas_exercises/blob/master/06_Stats/Wind_Stats/wind.data)"
    ]
   },
   {
@@ -235,7 +235,8 @@
    ],
    "source": [
     "# parse_dates gets 0, 1, 2 columns and parses them as the index\n",
-    "data = pd.read_table(\"wind.data\", sep = \"\\s+\", parse_dates = [[0,1,2]]) \n",
+    "data_url = 'https://raw.githubusercontent.com/guipsamora/pandas_exercises/master/06_Stats/Wind_Stats/wind.data'\n",
+    "data = pd.read_table(data_url, sep = \"\\s+\", parse_dates = [[0,1,2]]) \n",
     "data.head()"
    ]
   },
@@ -848,7 +849,7 @@
     "data['year'] = data['date'].apply(lambda date: date.year)\n",
     "data['day'] = data['date'].apply(lambda date: date.day)\n",
     "\n",
-    "# gets all value from the month 1 and assign to janyary_winds\n",
+    "# gets all value from the month 1 and assign to january_winds\n",
     "january_winds = data.query('month == 1')\n",
     "\n",
     "# gets the mean from january_winds, using .loc to not print the mean of month, year and day\n",
@@ -4209,7 +4210,8 @@
    ],
    "source": [
     "# call data again but this time don't use parse_dates\n",
-    "wind_data = pd.read_table(\"wind.data\", sep = \"\\s+\") \n",
+    "data_url = 'https://raw.githubusercontent.com/guipsamora/pandas_exercises/master/06_Stats/Wind_Stats/wind.data'\n",
+    "wind_data = pd.read_table(data_url, sep = \"\\s+\") \n",
     "\n",
     "# compute the month number for each day in the dataset, there are in total 216 months\n",
     "wind_data['months_num'] = (wind_data.iloc[:, 0] - 61) * 12 + wind_data.iloc[:, 1]\n",
@@ -4603,7 +4605,7 @@
     "weekly = data.resample('W').agg(['min','max','mean','std'])\n",
     "\n",
     "# slice it for the first 52 weeks and locations\n",
-    "weekly.ix[1:53, \"RPT\":\"MAL\"].head(10)"
+    "weekly.loc[weekly.index[1:53], \"RPT\":\"MAL\"] .head(10)"
    ]
   }
  ],
