fixed graphs and tables for report and logbook

Poster is very broken. The Report and Logbook are okay, but have last
year's images.

5 files changed, 35 insertions, 21 deletions

diff --git a/Makefile b/Makefile
index 988cc35..568631b 100644
--- a/Makefile
+++ b/Makefile
@@ -56,14 +56,13 @@ img/2019-12-13-1.jpg img/2019-12-13-3.rot.jpg fmt/doc.h report/tables.i
 
 poster2.pdf: imgs
 
-report.pdf poster.pdf logbook.pdf: imgs graph/made \
-tables.i fmt/font.h src/mats.i img/2019-12-02-2.jpg \
-img/2019-10-18-2.jpg img/2019-10-18-1.jpg img/2019-11-21-4.jpg \
-img/2019-12-13-2.jpg
+report.pdf poster.pdf logbook.pdf: fmt/font.h src/mats.i \
+img/2019-12-02-2.jpg img/2019-10-18-2.jpg img/2019-10-18-1.jpg \
+img/2019-11-21-4.jpg img/2019-12-13-2.jpg
 
 report2.pdf logbook2.pdf: fmt/doc.h
 
-$(PDF): $(TABLE) fmt/com.h
+$(PDF): $(TABLE) fmt/com.h fmt/font.h imgs graph/made tables.i
 
 imgs: py/data.py py/img.py
 	mkdir -p imgs
@@ -77,7 +76,7 @@ gen/deathtable.i: py/data.py py/deathtable.py gen/dir
 	$(PY) py/deathtable.py > gen/deathtable.i
 
 gen/deathtable2.i: py/data2.py py/deathtable2.py gen/dir
-	$(PY) py/deathtable2.py > gen/deathtable2.py
+	$(PY) py/deathtable2.py > gen/deathtable2.i
 
 gen/table.i: py/data.py py/table.py gen/dir
 	$(PY) py/table.py > gen/table.i
diff --git a/py/pvals.py b/py/pvals.py
index 9f46826..c11291e 100644
--- a/py/pvals.py
+++ b/py/pvals.py
@@ -53,7 +53,7 @@ for n in range(len(trials)):
     trial = trials[n]
     pvals[meths.index(trial.method)][sizes.index(trial.size)] = '%.4f' % calcpval(n)
 
-print('\\tabrule $12\\times12$&$24\\times24$\\cr\\tabrule')
+print('\\tabrule &$12\\times12$&$24\\times24$\\cr\\tabrule')
 for row in range(len(meths)):
     print(fancy[meths[row]],end='')
     for col in range(len(sizes)):
diff --git a/report2/graphs.i b/report2/graphs.i
index 8fb8ad3..914f28e 100644
--- a/report2/graphs.i
+++ b/report2/graphs.i
@@ -1,6 +1,18 @@
-\twopicture{imgs/2019-10-16.png}{imgs/2019-10-30.png}{}
-\twopicture{imgs/2019-12-3.png}{imgs/2019-12-5.png}{}
-\twopicture{imgs/2019-12-19.png}{imgs/2019-12-20.png}{Voronoi diagrams showing the territory of each antlion that formed a pit and well as the location, depth, and width of each pit}
+\twopicture{imgs/obstacles-12x12.png}{imgs/obstacles-24x24.png}{}
+\twopicture{imgs/trails-12x12.png}{imgs/trails-24x24.png}{}
+\twopicture{imgs/pits-12x12.png}{imgs/pits-24x24.png}{Each Voronoi
+diagram shows the allocation of ant-gathering territory, defined as the
+territory nearest to a given antlion pit. 
+These are particularly regular maps, even accounting for artificial pits
+and artificial obstacle interventions.
+}
 
-\picture{graph/depth_width.png}{Shows pit depth and width in relation to the square root of the trial area}
-\picture{graph/nearest_neighbor.png}{Shows the average nearest neighbor calculation for each trial group in relation to the square root of trial area, to create a ratio. Larger dots means more pits had that same area and depth or width.}
+\picture{graph/boxplot.png}{Shows the nearest neighbor distance in
+various interventions, accounting for the variation observed in each
+trial.
+There are very few outliers, so the plot does not vary significantly.}
+\picture{graph/lineplot.png}{This histogram shows, with variances
+represented by half-length measures, various metrics over the trial.
+General trends were observed with pit width and depth corresponding to
+previous conclusions, but variances remained high.
+Per-trial measures (deaths, reclusion) are also included.}
diff --git a/report2/tables.i b/report2/tables.i
index 8f2eb5f..8e46664 100644
--- a/report2/tables.i
+++ b/report2/tables.i
@@ -1,9 +1,10 @@
 \input tables.i
 {%\baselineskip=13pt
-\centerline{\deaths}
-%\global\advance\pics by 1\relax
-%\nobreak\centerline{Figure \number\pics: Number of Deaths and Pits Successfully Formed in Each Trial/Subtrial}
-
-\centerline{\territory}
+\centerline{\deaths{}}
+\centerline{\stats{The basic statistics for trials occurring this year,
+including deaths, reclusivity, and quantitative averages.}}
+\centerline{\pvals{The p-values, compared to a random distribution, of
+the respective spatial distributions for each size, accounting for
+placement conditions like ``not on obstacles''}}
 \vfil\eject
 }
diff --git a/tables.i b/tables.i
index a6f7842..b1cad68 100644
--- a/tables.i
+++ b/tables.i
@@ -3,18 +3,20 @@
 \def\cline{\omit\vrule\hfil\vrule&\multispan{3}{\leaders\hrule\hfil}\cr}
 \newskip\tableskipamount\tableskipamount=2pt plus 1fill
 \def\tableskip{\hskip\tableskipamount}
-\def\cell#1{\tableskip\strut\ignorespaces #1\unskip\tableskip\vrule}
+\def\goodstrut{{\setbox0\hbox{(}\dimen0\ht0\vrule width 0pt height 1.2\dimen0 depth .2\dimen0}}
+\def\cell#1{\tableskip\goodstrut\ignorespaces #1\unskip\tableskip\vrule}
 
-\def\deaths{%
+\def\vardeaths#1{%
 \setbox0=\vbox{\offinterlineskip
 \halign{\vrule\cell{##}&&\cell{##}\cr\noalign{\hrule}
 Trial Size& Date& Introduced& Deaths& Pits formed\cr\noalign{\hrule}
 \input gen/deathtable.i
 }}%
 \dimen0\wd0
-\vbox{\box0{\hsize\dimen0\caption{Number of Deaths and Pits Successfully
-Formed in Each Trial/Subtrial}}}%
+\vbox{\box0{\hsize\dimen0\caption{#1}}}%
 }
+\def\deaths{\vardeaths{Number of Deaths and Pits Successfully Formed in
+Each Trial/Subtrial}}
 
 \def\territory{%
 \setbox0=\vbox{\strut\hrule}\dimen0=.5\ht0