Merge remote-tracking branch 'cam/master' into chap3-style

eli-b · eli-b · commit 74b7ee2bf548 · 2014-02-09T18:16:39.000+02:00
Conflicts:
	Chapter3_MCMC/IntroMCMC.ipynb
diff --git a/Chapter1_Introduction/Chapter1_Introduction.ipynb b/Chapter1_Introduction/Chapter1_Introduction.ipynb
diff --git a/Chapter1_Introduction/README.md b/Chapter1_Introduction/README.md
@@ -0,0 +1 @@
+[Read it online here](http://nbviewer.ipython.org/urls/raw.github.com/CamDavidsonPilon/Probabilistic-Programming-and-Bayesian-Methods-for-Hackers/master/Chapter1_Introduction/Chapter1_Introduction.ipynb)
diff --git a/Chapter2_MorePyMC/MorePyMC.ipynb b/Chapter2_MorePyMC/MorePyMC.ipynb
diff --git a/Chapter2_MorePyMC/README.md b/Chapter2_MorePyMC/README.md
@@ -0,0 +1 @@
+[Read it online here](http://nbviewer.ipython.org/urls/raw.github.com/CamDavidsonPilon/Probabilistic-Programming-and-Bayesian-Methods-for-Hackers/master/Chapter2_MorePyMC/MorePyMC.ipynb)
diff --git a/Chapter3_MCMC/IntroMCMC.ipynb b/Chapter3_MCMC/IntroMCMC.ipynb
diff --git a/Chapter3_MCMC/README.md b/Chapter3_MCMC/README.md
@@ -0,0 +1 @@
+[Read it online here](http://nbviewer.ipython.org/urls/raw.github.com/CamDavidsonPilon/Probabilistic-Programming-and-Bayesian-Methods-for-Hackers/master/Chapter3_MCMC/IntroMCMC.ipynb)
diff --git a/Chapter4_TheGreatestTheoremNeverTold/LawOfLargeNumbers.ipynb b/Chapter4_TheGreatestTheoremNeverTold/LawOfLargeNumbers.ipynb
diff --git a/Chapter4_TheGreatestTheoremNeverTold/README.md b/Chapter4_TheGreatestTheoremNeverTold/README.md
@@ -0,0 +1 @@
+[Read it online here](http://nbviewer.ipython.org/urls/raw.github.com/CamDavidsonPilon/Probabilistic-Programming-and-Bayesian-Methods-for-Hackers/master/Chapter4_TheGreatestTheoremNeverTold/LawOfLargeNumbers.ipynb)
diff --git a/Chapter5_LossFunctions/LossFunctions.ipynb b/Chapter5_LossFunctions/LossFunctions.ipynb
diff --git a/Chapter5_LossFunctions/README.md b/Chapter5_LossFunctions/README.md
@@ -0,0 +1 @@
+[Read it online here](http://nbviewer.ipython.org/urls/raw.github.com/CamDavidsonPilon/Probabilistic-Programming-and-Bayesian-Methods-for-Hackers/master/Chapter5_LossFunctions/LossFunctions.ipynb)
diff --git a/Chapter6_Priorities/Priors.ipynb b/Chapter6_Priorities/Priors.ipynb
diff --git a/Chapter6_Priorities/README.md b/Chapter6_Priorities/README.md
@@ -0,0 +1 @@
+[Read it online here](http://nbviewer.ipython.org/urls/raw.github.com/CamDavidsonPilon/Probabilistic-Programming-and-Bayesian-Methods-for-Hackers/master/Chapter6_Priorities/Priors.ipynb)
diff --git a/Chapter7_BayesianMachineLearning/MachineLearning.ipynb b/Chapter7_BayesianMachineLearning/MachineLearning.ipynb
@@ -80,7 +80,7 @@
         "<style>\n",
         "    @font-face {\n",
         "        font-family: \"Computer Modern\";\n",
-        "        src: url('http://mirrors.ctan.org/fonts/cm-unicode/fonts/otf/cmunss.otf');\n",
+        "        src: url('http://9dbb143991406a7c655e-aa5fcb0a5a4ec34cff238a2d56ca4144.r56.cf5.rackcdn.com/cmunss.otf');\n",
         "    }\n",
         "    div.cell{\n",
         "        width:54%;\n",
diff --git a/Prologue/Prologue.ipynb b/Prologue/Prologue.ipynb
@@ -200,7 +200,7 @@
         "<style>\n",
         "    @font-face {\n",
         "        font-family: \"Computer Modern\";\n",
-        "        src: url('http://mirrors.ctan.org/fonts/cm-unicode/fonts/otf/cmunss.otf');\n",
+        "        src: url('http://9dbb143991406a7c655e-aa5fcb0a5a4ec34cff238a2d56ca4144.r56.cf5.rackcdn.com/cmunss.otf');\n",
         "    }\n",
         "    div.cell{\n",
         "        width:800px;\n",
diff --git a/README.md b/README.md
@@ -92,7 +92,6 @@ this book, though it comes with some dependencies.
     -  IPython v0.13 (or greater) is a requirement to view the ipynb files. It can be downloaded [here](http://ipython.org/). IPython notebooks can be run by `(your-virtualenv) ~/path/to/the/book/Chapter1_Introduction $ ipython notebook`
     -  For Linux users, you should not have a problem installing NumPy, SciPy, Matplotlib and PyMC. For Windows users, check out [pre-compiled versions](http://www.lfd.uci.edu/~gohlke/pythonlibs/) if you have difficulty. 
     -  In the styles/ directory are a number of files (.matplotlirc) that used to make things pretty. These are not only designed for the book, but they offer many improvements over the default settings of matplotlib.
-    -  while technically not required, it may help to run the IPython notebook with `ipython notebook --pylab inline` flag if you encounter io errors.
 2. The second, preferred, option is to use the nbviewer.ipython.org site, which display IPython notebooks in the browser ([example](http://nbviewer.ipython.org/urls/raw.github.com/CamDavidsonPilon/Probabilistic-Programming-and-Bayesian-Methods-for-Hackers/master/Chapter1_Introduction/Chapter1_Introduction.ipynb)).
 The contents are updated synchronously as commits are made to the book. You can use the Contents section above to link to the chapters.
  
diff --git a/requirements.txt b/requirements.txt
@@ -6,3 +6,4 @@ pyzmq>=13.1.0
 scipy>=0.12.0
 tornado>=3.0.2
 wsgiref>=0.1.2
+praw>=2.0.0
diff --git a/sandbox/Chapter10_/More hacking with PyMC.ipynb b/sandbox/Chapter10_/More hacking with PyMC.ipynb
@@ -583,7 +583,7 @@
         "<style>\n",
         "    @font-face {\n",
         "        font-family: \"Computer Modern\";\n",
-        "        src: url('http://mirrors.ctan.org/fonts/cm-unicode/fonts/otf/cmunss.otf');\n",
+        "        src: url('http://9dbb143991406a7c655e-aa5fcb0a5a4ec34cff238a2d56ca4144.r56.cf5.rackcdn.com/cmunss.otf');\n",
         "    }\n",
         "    div.cell{\n",
         "        width:800px;\n",
diff --git a/styles/custom.css b/styles/custom.css
@@ -1,7 +1,7 @@
 <style>
     @font-face {
         font-family: "Computer Modern";
-        src: url('http://mirrors.ctan.org/fonts/cm-unicode/fonts/otf/cmunss.otf');
+        src: url('http://9dbb143991406a7c655e-aa5fcb0a5a4ec34cff238a2d56ca4144.r56.cf5.rackcdn.com/cmunss.otf');
     }
     div.cell{
         width:800px;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+[Read it online here](http://nbviewer.ipython.org/urls/raw.github.com/CamDavidsonPilon/Probabilistic-Programming-and-Bayesian-Methods-for-Hackers/master/Chapter1_Introduction/Chapter1_Introduction.ipynb)`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`<style>`
`2`	`2`	`@font-face {`
`3`	`3`	`font-family: "Computer Modern";`
`4`		`- src: url('http://mirrors.ctan.org/fonts/cm-unicode/fonts/otf/cmunss.otf');`
	`4`	`+ src: url('http://9dbb143991406a7c655e-aa5fcb0a5a4ec34cff238a2d56ca4144.r56.cf5.rackcdn.com/cmunss.otf');`
`5`	`5`	`}`
`6`	`6`	`div.cell{`
`7`	`7`	`width:800px;`