squished some stuff into two pages on report

4 files changed, 31 insertions, 16 deletions

diff --git a/fmt/doc.h b/fmt/doc.h
index 09bf4e9..f3d985e 100644
--- a/fmt/doc.h
+++ b/fmt/doc.h
@@ -24,5 +24,6 @@
 }
 %% Pictures
 \def\pic#1#2{\pdfximage width #1{#2}\pdfrefximage\pdflastximage}
-\def\picture#1#2{\def\a{#2}\ifx\a\empty\fi\vbox{\centerline{\pic{5in}{#1}}\caption{#2}}}
-\def\twopicture#1#2#3{\def\a{#3}\ifx\a\empty\fi\vbox{\line{\pic{3in}{#1}\hfil\pic{3in}{#2}}\caption{#3}}}
+\def\picture#1#2{\vbox{\centerline{\pic{5in}{#1}}\caption{#2}}}
+\def\twopicture#1#2#3{\vbox{\line{\pic{3in}{#1}\hfil\pic{3in}{#2}}\caption{#3}}}
+\def\dubpicture#1#2#3#4{\line{\hsize=3in\parindent=0pt\vtop{\pic{3in}{#1}\caption{#3}}\hfil\vtop{\pic{3in}{#2}\caption{#4}}}}
diff --git a/report2.tex b/report2.tex
index 64ccae7..66fa455 100644
--- a/report2.tex
+++ b/report2.tex
@@ -44,12 +44,8 @@ Source: \link{https://git.hrhr.dev/scifair}\par
 
 \section{Appendix A: Graphs}\input report2/graphs.i
 
-\vfil\eject
-
 \section{Appendix B: Tables}\input report2/tables.i
 
-\vfil\eject
-
 \section{Appendix C: Pictures}\input report2/pics.i
 
 \vfil\eject
diff --git a/report2/pics.i b/report2/pics.i
index f02cf06..cbe6fa4 100644
--- a/report2/pics.i
+++ b/report2/pics.i
@@ -1,6 +1,25 @@
-\twopicture{img/2019-10-18-1.jpg}{img/2019-10-18-2.jpg}{Pictures of the 32x33 trial group, a six inch ruler is shown for scale.}
-\twopicture{img/2019-10-30-1.jpg}{img/2019-11-21-1.jpg}{Initial pictures of the 24x25 trial group including the new cardboard barrier for reference.}
-\twopicture{img/2019-11-21-2.jpg}{img/2019-11-21-3.jpg}{(Left) A photograph of the first 16x17 trial, note antlion trails that are shown, a six inch ruler is shown for scale. (Right) A picture of the reinforced cardboard barrier to prevent antlions from escaping.}
-\twopicture{img/2019-11-21-4.jpg}{img/2019-12-02-1.jpg}{Two alternate views of the 16x17 trial size, note antlion trails and toothpicks denoting the location of antlion pits.}
-\twopicture{img/2019-12-02-2.jpg}{img/2019-12-13-1.jpg}{(Left) A close up image of the 16x17 trial size, note pits and dead antlions, ruler shown for scale (Right) A close up image of the 8x9 trial size, note smaller and less consistent pits, a six inch ruler shown for scale}
-\twopicture{img/2019-12-13-2.jpg}{img/2019-12-13-3.rot.jpg}{(Left) A picture of an antlion being removed from the trial period (Right) An image of an antlion in its temporary container}
+\dubpicture{img/obstacle-large.rot.jpg}{img/2019-10-18-1.jpg}{The third
+$24\times24$ trial, with obstacles introduced into the container.}{A 3cm
+antlion pit}
+
+\iffalse\dubpicture{img/pcr.jpg}{img/final-settlement-fake-pits.rot.jpg}{Part
+of the DNA barcoding process for species determination}{An image depicting
+the final settlement of the antlions during the $24\times24$
+trial with fake pits, showing how antlions tend to avoid fake
+pits.}\fi
+
+\dubpicture{img/2019-12-13-3.rot.jpg}{img/overhead-fake-pits.rot.jpg}{An antlion
+in the inter-trial holding containers with native sand}{An image
+depicting the distribution of fake pits along the $24\times24$ trial,
+showing the 12 fake pits.}
+
+\dubpicture{img/Overhead-with-obstacle.rot.jpg}{img/corner-settle.rot.jpg}{The
+$12\times12$ trial with the introduction of an obstacle, showing how the
+$24\times24$ and $12\times12$ trials were separated.}{An antlion settled
+in the corner of the $12\times12$ trial, which was observed repeatedly.}
+
+\dubpicture{img/fake-pits.rot.jpg}{img/code.png}{An image depicting the
+fake pits that were introduced to the $24\times24$ trial, where a total
+of 12 fake pits were introduced, each with a pit depth of 5cm and a pit
+width of 8cm.}{The code used to generate Voronoi diagrams with SciPy and
+Matplotlib}
diff --git a/report2/tables.i b/report2/tables.i
index 8e46664..04858c1 100644
--- a/report2/tables.i
+++ b/report2/tables.i
@@ -3,8 +3,7 @@
 \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
+\centerline{\pvals{The p-values, compared to a uniformly random
+distribution, of the respective spatial distributions for each size,
+accounting for placement conditions like ``not on obstacles''}}
 }