Merge pull request CamDavidsonPilon#1 from CamDavidsonPilon/master

Pulling changes

Author: KartikTalwar

Chapter1_Introduction/Chapter1_Introduction.ipynb

@@ -1,4 +1,7 @@
 #daft drawing for SMS example
+import matplotlib.pyplot as plt
+
+
 
 try:
     import daft
@@ -12,7 +15,7 @@
 pgm.add_node(daft.Node("lambda1", r"$\lambda_1$", 5.5, 3.2,))
 pgm.add_node(daft.Node("lambda2", r"$\lambda_2$", 6.5, 3.2))
 pgm.add_node(daft.Node("lambda", r"$\lambda$", 5.0, 2.0))
-pgm.add_node(daft.Node("obs", "SMS\nobs", 5.0, 1.0, 1.2, observed=True))
+pgm.add_node(daft.Node("obs", "obs", 5.0, 1.0, 1.2, observed=True))
 
 
 
@@ -24,5 +27,5 @@
 
 pgm.add_edge("lambda", "obs")
 pgm.render()
-
+plt.figure( figsize=(12,5) )
 plt.show()

Chapter2_MorePyMC/MorePyMC.ipynb

@@ -36,10 +36,11 @@ def separation_plot( p, y, **kwargs ):
         ax = fig.add_subplot(M, 1, i+1)
         ix = np.argsort( p[:,i] )
         #plot the different bars
-        bars = ax.bar( np.arange(n)-1, np.ones(n), width=1., 
+        bars = ax.bar( np.arange(n), np.ones(n), width=1., 
                 color = colors_bmh[ y[ix].astype(int) ], 
                 edgecolor = 'none')
-        ax.plot( np.arange(n), p[ix,i], "k", linewidth = 0.75)
+        ax.plot( np.arange(n), p[ix,i], "k", 
+                linewidth = 1.,drawstyle="steps-post" )
         #create expected value bar.
         ax.vlines( [(1-p[ix,i]).sum()], [0], [1] )
         #ax.grid(False)

Chapter2_MorePyMC/daft_plot.py

@@ -1,18 +1,26 @@
+import sys
+
 import numpy as np
 from IPython.core.display import Image
 
-
 import praw
 
 
 reddit = praw.Reddit("BayesianMethodsForHackers")
 subreddit  = reddit.get_subreddit( "pics" )
 
 top_submissions = subreddit.get_top()
-top_submission = top_submissions.next()
-while "i.imgur.com" not in top_submission.url:
-    #make sure it is linking to an image, not a webpage.
+
+
+n_pic = int( sys.argv[1] ) if sys.argv[1] else 1
+
+i = 0
+while i < n_pic:
     top_submission = top_submissions.next()
+    while "i.imgur.com" not in top_submission.url:
+        #make sure it is linking to an image, not a webpage.
+        top_submission = top_submissions.next()
+    i+=1
 
 print "Title of submission: \n", top_submission.title
 top_post_url = top_submission.url
@@ -34,6 +42,9 @@
 
 votes = np.array( [ upvotes, downvotes] ).T
 
+
+
+