Merge branch 'master' of raven:scientificComputing

bootstrap/lecture/bootstrap-chapter.tex

@@ -5,8 +5,8 @@
 \lstset{inputpath=../code}
 \graphicspath{{figures/}}
 
-\setcounter{page}{81}
+\setcounter{page}{}
-\setcounter{chapter}{4}
+\setcounter{chapter}{-1}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

likelihood/lecture/likelihood-chapter.tex

@@ -5,8 +5,8 @@
 \lstset{inputpath=../code}
 \graphicspath{{figures/}}
 
-\setcounter{page}{101}
+\setcounter{page}{}
-\setcounter{chapter}{6}
+\setcounter{chapter}{-1}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

pointprocesses/lecture/isihexamples.py

@@ -98,4 +98,4 @@ plotisih(ax, isis(inhspikes))
 
 plt.tight_layout()
 plt.savefig('isihexamples.pdf')
-plt.show()
+plt.close()

pointprocesses/lecture/pointprocessscetchA.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: pointprocessscetchA.tex
 %%Creator: gnuplot 4.6 patchlevel 4
-%%CreationDate: Sun Nov 22 12:40:02 2015
+%%CreationDate: Mon Nov 23 13:45:26 2015
 %%DocumentFonts: 
 %%BoundingBox: 50 50 373 135
 %%EndComments
@@ -430,10 +430,10 @@ SDict begin [
   /Title (pointprocessscetchA.tex)
   /Subject (gnuplot plot)
   /Creator (gnuplot 4.6 patchlevel 4)
-  /Author (jan)
+  /Author (grewe)
 %  /Producer (gnuplot)
 %  /Keywords ()
-  /CreationDate (Sun Nov 22 12:40:02 2015)
+  /CreationDate (Mon Nov 23 13:45:26 2015)
   /DOCINFO pdfmark
 end
 } ifelse

pointprocesses/lecture/pointprocessscetchB.eps

@@ -1,7 +1,7 @@
 %!PS-Adobe-2.0 EPSF-2.0
 %%Title: pointprocessscetchB.tex
 %%Creator: gnuplot 4.6 patchlevel 4
-%%CreationDate: Sun Nov 22 12:40:02 2015
+%%CreationDate: Mon Nov 23 13:46:59 2015
 %%DocumentFonts: 
 %%BoundingBox: 50 50 373 237
 %%EndComments
@@ -430,10 +430,10 @@ SDict begin [
   /Title (pointprocessscetchB.tex)
   /Subject (gnuplot plot)
   /Creator (gnuplot 4.6 patchlevel 4)
-  /Author (jan)
+  /Author (grewe)
 %  /Producer (gnuplot)
 %  /Keywords ()
-  /CreationDate (Sun Nov 22 12:40:02 2015)
+  /CreationDate (Mon Nov 23 13:46:59 2015)
   /DOCINFO pdfmark
 end
 } ifelse

pointprocesses/lecture/rasterexamples.py

@@ -83,4 +83,4 @@ ax.eventplot(inhspikes, colors=[[0, 0, 0]], linelength=0.8)
 
 plt.tight_layout()
 plt.savefig('rasterexamples.pdf')
-plt.show()
+plt.close()

pointprocesses/lecture/sta.py

@@ -43,12 +43,12 @@ def plot_results(sta_time, st_average, stim_time, s_est, stimulus, duration, dt)
     
     fig = plt.gcf()
     fig.set_size_inches(15, 5)
-    fig.subplots_adjust(left=0.075, bottom=0.12, top=0.92, right=0.975)
+    fig.subplots_adjust(left=0.08, bottom=0.15, top=0.9, right=0.975)
     fig.set_facecolor("white")
 
     sta_ax.plot(sta_time * 1000, st_average, color="dodgerblue", lw=2.)
-    sta_ax.set_xlabel("time [ms]", fontsize=12)
+    sta_ax.set_xlabel("time [ms]", fontsize=20)
-    sta_ax.set_ylabel("stimulus", fontsize=12)
+    sta_ax.set_ylabel("stimulus", fontsize=20)
     sta_ax.set_xlim([-50, 50])
     #  sta_ax.xaxis.grid('off')
     sta_ax.spines["right"].set_visible(False)
@@ -57,7 +57,7 @@ def plot_results(sta_time, st_average, stim_time, s_est, stimulus, duration, dt)
     sta_ax.xaxis.set_ticks_position('bottom')
     sta_ax.spines["bottom"].set_linewidth(2.0)
     sta_ax.spines["left"].set_linewidth(2.0)
-    sta_ax.tick_params(direction="out", width=2.0)
+    sta_ax.tick_params(direction="out", width=2.0, labelsize=18)
 
     ylim = sta_ax.get_ylim()
     xlim = sta_ax.get_xlim()
@@ -65,11 +65,11 @@ def plot_results(sta_time, st_average, stim_time, s_est, stimulus, duration, dt)
     sta_ax.plot([0., 0.], list(ylim), zorder=1, color='darkgray', ls='--', lw=0.75)
     sta_ax.set_xlim(list(xlim))
     sta_ax.set_ylim(list(ylim))
-    sta_ax.text(-0.225, 1.05, "A", transform=sta_ax.transAxes, size=14)
+    sta_ax.text(-0.25, 1.04, "A", transform=sta_ax.transAxes, size=24)
 
     stim_ax.plot(stim_time * 1000, stimulus[:,1], label='stimulus', color='dodgerblue', lw=2.)
     stim_ax.plot(stim_time * 1000, s_est, label='reconstruction', color='red', lw=2)
-    stim_ax.set_xlabel('time[ms]', fontsize=12)
+    stim_ax.set_xlabel('time[ms]', fontsize=20)
     stim_ax.set_xlim([0.0, 250])
     stim_ax.set_ylim([-1., 1.])
     stim_ax.legend()
@@ -80,8 +80,8 @@ def plot_results(sta_time, st_average, stim_time, s_est, stimulus, duration, dt)
     stim_ax.xaxis.set_ticks_position('bottom')
     stim_ax.spines["bottom"].set_linewidth(2.0)
     stim_ax.spines["left"].set_linewidth(2.0)
-    stim_ax.tick_params(direction="out", width=2.0)
+    stim_ax.tick_params(direction="out", width=2.0, labelsize=18)
-    stim_ax.text(-0.075, 1.05, "B", transform=stim_ax.transAxes, size=14)
+    stim_ax.text(-0.1, 1.04, "B", transform=stim_ax.transAxes, size=24)
     
     fig.savefig("sta.pdf")
     plt.close()

regression/lecture/regression-chapter.tex

@@ -5,8 +5,8 @@
 \lstset{inputpath=../code}
 \graphicspath{{figures/}}
 
-\setcounter{page}{89}
+\setcounter{page}{}
-\setcounter{chapter}{5}
+\setcounter{chapter}{-1}
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%