MNT: move weather data around and pull data for ORNL

tacaswell · tacaswell · commit 5e5ffe19f4ce · 2017-11-06T11:06:31.000-05:00
diff --git a/weather/04-custom_plotting.py b/weather/04-custom_plotting.py
@@ -0,0 +1,32 @@
+import matplotlib.pyplot as plt
+from w_helpers import load_bwi_data, aggregate_by_month
+plt.ion()
+
+bwi = load_bwi_data()
+bwi_monthly = aggregate_by_month(bwi)
+
+fig, ax = plt.subplots()
+
+
+def plot_aggregated_errorbar(ax, gb, label, picker=None, **kwargs):
+    kwargs.setdefault('capsize', 3)
+    kwargs.setdefault('markersize', 5)
+    kwargs.setdefault('marker', 'o')
+    eb = ax.errorbar(gb.index, 'mean',
+                     yerr='std',
+                     data=gb,
+                     label=label,
+                     picker=picker,
+                     **kwargs)
+    fill = ax.fill_between(gb.index, 'min', 'max', alpha=.5,
+                           data=gb, color=eb[0].get_color())
+    ax.legend()
+    ax.figure.canvas.draw_idle()
+    return eb, fill
+
+
+arts = plot_aggregated_errorbar(ax, bwi_monthly, 'bwi')
+
+# EXERCISE
+# - make the shaded area configurable
+# - make center line configurable
diff --git a/weather/05-interactive_temperature.py b/weather/05-interactive_temperature.py
@@ -1,13 +1,11 @@
 import matplotlib.pyplot as plt
 from cycler import cycler
-from pddc_helpers import (load_bwi_data, aggregate_by_month, aggregate_by_day,
+from w_helpers import (load_ornl_data, aggregate_by_month, aggregate_by_day,
                           extract_day_of_hourly, extract_month_of_daily)
 
 
 plt.ion()
 
-bwi = load_bwi_data()
-
 
 def setup_temperature_figure(**kwargs):
     fig, ax_lst = plt.subplots(3, 1, sharey=True, **kwargs)
@@ -22,6 +20,7 @@ def setup_temperature_figure(**kwargs):
     fig.tight_layout()
     return fig, ax_lst
 
+
 def plot_aggregated_errorbar(ax, gb, label, picker=None, **kwargs):
     kwargs.setdefault('capsize', 3)
     kwargs.setdefault('markersize', 5)
@@ -210,8 +209,9 @@ def remove(self):
         self.yearly_ax.figure.canvas.mpl_disconnect(self.cid)
 
 
+ornl = load_ornl_data()
 fig, (ax_by_month, ax_by_day, ax_by_hour) = setup_temperature_figure()
-bwi_at = AggregatedTimeTrace(bwi, 'bwi', ax_by_month, ax_by_day, ax_by_hour)
+ornl_at = AggregatedTimeTrace(ornl, 'ornl', ax_by_month, ax_by_day, ax_by_hour)
 fig.suptitle('Temperature')
 
 
diff --git a/weather/99-get_data.py b/weather/99-get_data.py
@@ -16,6 +16,7 @@
 
 plt.ion()
 
+
 def get_filtered_isd(data_dir, s_date=None, f_date=None,
                      allow_download=True):
     fname = 'isd-history.csv'
diff --git a/weather/bwi.h5 b/weather/bwi.h5
diff --git a/weather/key/04-custom_plotting.py b/weather/key/04-custom_plotting.py
@@ -7,30 +7,6 @@
 
 fig, ax = plt.subplots()
 
-
-def plot_aggregated_errorbar(ax, gb, label, picker=None, **kwargs):
-    kwargs.setdefault('capsize', 3)
-    kwargs.setdefault('markersize', 5)
-    kwargs.setdefault('marker', 'o')
-    eb = ax.errorbar(gb.index, 'mean',
-                     yerr='std',
-                     data=gb,
-                     label=label,
-                     picker=picker,
-                     **kwargs)
-    fill = ax.fill_between(gb.index, 'min', 'max', alpha=.5,
-                           data=gb, color=eb[0].get_color())
-    ax.legend()
-    ax.figure.canvas.draw_idle()
-    return eb, fill
-
-arts = plot_aggregated_errorbar(ax, bwi_monthly, 'bwi')
-
-# EXERCISE
-# - make the shaded area configurable
-# - make center line configurable
-
-
 def plot_aggregated_errorbar(ax, gb, label, picker=None, *,
                              bands=None,
                              center_line='mean',
diff --git a/weather/ornl.h5 b/weather/ornl.h5
diff --git a/weather/w_helpers.py b/weather/w_helpers.py
@@ -4,15 +4,15 @@
 
 
 def aggregate_by_month(df, col='T'):
-    gb = df.groupby(('year', 'month'))['T'].describe().unstack()
+    gb = df.groupby(('year', 'month'))['T'].describe()
     new_index = [datetime.date(*m, *(15, )) for m in gb.index]
     gb.reset_index(inplace=True)
     gb.index = new_index
     return gb
 
 
 def aggregate_by_day(df, col='T'):
-    gb = df.groupby(('year', 'month', 'day'))['T'].describe().unstack()
+    gb = df.groupby(('year', 'month', 'day'))['T'].describe()
     new_index = [datetime.date(*m) for m in gb.index]
     gb.reset_index(inplace=True)
     gb.index = new_index
@@ -56,6 +56,12 @@ def load_bwi_data():
     return pd.read_hdf(fname)
 
 
+def load_ornl_data():
+    fname = os.path.join(os.path.dirname(os.path.realpath(__file__)),
+                         'ornl.h5')
+    return pd.read_hdf(fname)
+
+
 def label_date(ax, label, date, df):
     '''Helper function to annotate a date
 
