From 1512a0b2127fbf14b7e667ee5c3c9d33bbbd5b86 Mon Sep 17 00:00:00 2001
From: Kellie Ottoboni <kellieotto@berkeley.edu>
Date: Thu, 24 May 2018 14:03:09 -0700
Subject: [PATCH 1/2] add option to plot balance inline in jupyter notebooks

---
 pscore_match/match.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pscore_match/match.py b/pscore_match/match.py
index 1d28e93..ff2dc95 100644
--- a/pscore_match/match.py
+++ b/pscore_match/match.py
@@ -213,7 +213,7 @@ def _match_info(self):
         self.matches['dropped'] = np.setdiff1d(list(range(self.nobs)), 
                                     np.append(self.matches['treated'], self.matches['control']))
 
-    def plot_balance(self, covariates, test=['t', 'rank'], filename='balance-plot',
+    def plot_balance(self, covariates, test=['t', 'rank'], notebook=False, filename='balance-plot',
                      **kwargs):
         """
         Plot the p-values for covariate balance before and after matching
@@ -227,6 +227,8 @@ def plot_balance(self, covariates, test=['t', 'rank'], filename='balance-plot',
         test : array-like or str
             Statistical test to compare treatment and control covariate distributions.
             Options are 't' for a two sample t-test or 'rank' for Wilcoxon rank sum test
+        notebook : bool
+            Optional, plot inline in a Jupyter notebook? Default False
         filename : str
             Optional, name of file to save plot in. Default 'balance-plot'
         kwargs : dict
@@ -356,7 +358,10 @@ def plot_balance(self, covariates, test=['t', 'rank'], filename='balance-plot',
             hovermode='closest'
         )
         fig = go.Figure(data=data, layout=layout)
-        plotly.offline.plot(fig, filename=filename, show_link=False, **kwargs)
+        if notebook:
+            plotly.offline.iplot(fig, filename=filename, show_link=False, **kwargs)
+        else:
+            plotly.offline.plot(fig, filename=filename, show_link=False, **kwargs)
 
 
 ################################################################################

From c31985079f139aea7d298c7e356ee5277d766114 Mon Sep 17 00:00:00 2001
From: Kellie Ottoboni <kellieotto@berkeley.edu>
Date: Thu, 24 May 2018 14:22:05 -0700
Subject: [PATCH 2/2] upgrade numpy in requirements

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 772e99c..01c1c85 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-numpy==1.11.1
+numpy==1.14.1
 scipy==0.17.1
 nose==1.3.7
 coverage==4.2