From 10ed729f56a42e3701bc4c33fe6e9cc1bdcdbe54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Nusser?= <andre.nusser@googlemail.com>
Date: Mon, 10 Feb 2020 00:33:00 +0100
Subject: Add experiment for number of evaluations.

---
 sampling_alg_lac2020/LAC-20.tex                    |   28 +-
 .../figures/selection_count/112_count.txt          | 1015 +++++++++++++++++++
 .../figures/selection_count/16_count.txt           | 1015 +++++++++++++++++++
 .../figures/selection_count/48_count.txt           | 1015 +++++++++++++++++++
 .../figures/selection_count/80_count.txt           | 1015 +++++++++++++++++++
 .../figures/selection_count/calc_stats.py          |   19 +
 .../figures/selection_count/sweep_count.txt        | 1016 ++++++++++++++++++++
 sampling_alg_lac2020/midi_tests/run_tests.sh       |    7 +-
 sampling_alg_lac2020/midi_tests/test_and_plot.sh   |   48 +-
 9 files changed, 5145 insertions(+), 33 deletions(-)
 create mode 100644 sampling_alg_lac2020/figures/selection_count/112_count.txt
 create mode 100644 sampling_alg_lac2020/figures/selection_count/16_count.txt
 create mode 100644 sampling_alg_lac2020/figures/selection_count/48_count.txt
 create mode 100644 sampling_alg_lac2020/figures/selection_count/80_count.txt
 create mode 100755 sampling_alg_lac2020/figures/selection_count/calc_stats.py
 create mode 100644 sampling_alg_lac2020/figures/selection_count/sweep_count.txt

diff --git a/sampling_alg_lac2020/LAC-20.tex b/sampling_alg_lac2020/LAC-20.tex
index 3b55bc8..cbbcb17 100644
--- a/sampling_alg_lac2020/LAC-20.tex
+++ b/sampling_alg_lac2020/LAC-20.tex
@@ -617,13 +617,27 @@ The second experiment we conducted for two different MIDI velocities: MIDI veloc
 
 % \todoandre{Also do an experiment regarding the adaptive search}
 To also get an idea of the performance of the new sampling algorithm, we want to see how many power values of samples are evaluated per query.
-Without the smart search optimization described at the end of Section \ref{sec:implementation}, this number would always be the number of samples. However, we expect that the smart search optimization significantly reduces the number of evaluations. To test this hypothesis, we take the above experiment and look at the number of evaluations. You can see the histogram in Figure \ref{fig:evaluations_histogram}. \todo{fix}
-
-\begin{figure}
-	% \includegraphics[width=.8\linewidth]{figures/evaluations_histogram.pdf}
-	\caption{This plot shows the histogram of the number of evaluations of power values for the queries of experiment bla.\todo{insert correct information}}
-	\label{fig:evaluations_histogram}
-\end{figure}
+Without the smart search optimization described at the end of Section \ref{sec:implementation}, this number would always be the number of samples. However, we expect that the smart search optimization significantly reduces the number of evaluations. To test this hypothesis, we take the above experiment and look at the number of evaluations. You can see some data regarding the number of evaluations in Table \ref{tab:evaluation_count}.
+
+% \begin{figure}
+%     % \includegraphics[width=.8\linewidth]{figures/evaluations_histogram.pdf}
+%     \caption{This plot shows the histogram of the number of evaluations of power values for the queries of experiment bla.\todo{insert correct information}}
+%     \label{fig:evaluations_histogram}
+% \end{figure}
+
+\begin{table}
+\caption{Number of evaluations per query.}
+\label{tab:evaluation_count}
+\centering
+\begin{tabular}{|l||rrrrr|}
+\hline
+experiment & sweep & 16 & 48 & 80 & 112 \\
+\hline
+mean evaluations & 6.81 & 13.99 & 12.93 & 10.88 & 4.00 \\
+variance evaluations & 6.09 & 0.04 & 2.34 & 0.25 & 0.00 \\
+\hline
+\end{tabular}
+\end{table}
 
 \todoandre{Summarize experiments}
 
diff --git a/sampling_alg_lac2020/figures/selection_count/112_count.txt b/sampling_alg_lac2020/figures/selection_count/112_count.txt
new file mode 100644
index 0000000..705b8cb
--- /dev/null
+++ b/sampling_alg_lac2020/figures/selection_count/112_count.txt
@@ -0,0 +1,1015 @@
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
+4
diff --git a/sampling_alg_lac2020/figures/selection_count/16_count.txt b/sampling_alg_lac2020/figures/selection_count/16_count.txt
new file mode 100644
index 0000000..2c8744e
--- /dev/null
+++ b/sampling_alg_lac2020/figures/selection_count/16_count.txt
@@ -0,0 +1,1015 @@
+17
+17
+15
+15
+14
+14
+15
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+14
+13
+14
+14
+14
+14
+14
+14
+14
+14
+14
diff --git a/sampling_alg_lac2020/figures/selection_count/48_count.txt b/sampling_alg_lac2020/figures/selection_count/48_count.txt
new file mode 100644
index 0000000..34d1edd
--- /dev/null
+++ b/sampling_alg_lac2020/figures/selection_count/48_count.txt
@@ -0,0 +1,1015 @@
+17
+16
+16
+16
+15
+15
+15
+14
+14
+15
+15
+13
+13
+10
+15
+13
+12
+13
+15
+14
+12
+15
+12
+13
+13
+15
+14
+15
+15
+11
+15
+12
+12
+12
+12
+13
+13
+13
+13
+14
+13
+13
+13
+15
+13
+12
+13
+11
+14
+10
+15
+12
+12
+15
+13
+12
+13
+12
+13
+13
+15
+13
+15
+13
+15
+13
+12
+13
+10
+11
+15
+13
+14
+13
+11
+13
+12
+11
+11
+13
+12
+11
+13
+13
+15
+13
+13
+14
+15
+13
+11
+13
+11
+11
+12
+13
+13
+16
+15
+12
+12
+15
+15
+13
+11
+13
+11
+10
+13
+15
+12
+15
+10
+13
+14
+13
+13
+11
+12
+11
+13
+12
+12
+10
+15
+13
+15
+15
+13
+13
+13
+13
+13
+12
+10
+11
+15
+15
+13
+11
+13
+11
+13
+13
+15
+12
+14
+15
+13
+13
+15
+13
+11
+11
+11
+15
+15
+15
+11
+13
+12
+13
+12
+13
+15
+14
+12
+12
+13
+14
+11
+13
+13
+15
+12
+13
+13
+14
+13
+13
+15
+13
+11
+12
+11
+11
+13
+15
+13
+10
+14
+13
+12
+11
+15
+15
+13
+13
+12
+13
+13
+10
+12
+15
+13
+12
+13
+12
+15
+13
+13
+13
+13
+12
+13
+13
+15
+12
+15
+12
+13
+14
+13
+15
+13
+11
+13
+11
+11
+13
+10
+12
+14
+15
+15
+14
+15
+12
+13
+12
+11
+13
+12
+15
+11
+12
+13
+13
+16
+15
+13
+13
+14
+13
+11
+11
+11
+13
+11
+12
+12
+15
+15
+13
+15
+13
+13
+15
+13
+13
+14
+12
+11
+13
+13
+11
+14
+15
+15
+10
+11
+10
+13
+10
+12
+15
+12
+11
+13
+13
+13
+13
+13
+13
+15
+11
+15
+14
+13
+15
+15
+14
+12
+15
+15
+11
+13
+13
+15
+12
+12
+13
+13
+13
+13
+12
+13
+15
+13
+15
+13
+11
+11
+14
+13
+13
+15
+15
+15
+14
+12
+13
+11
+10
+13
+12
+15
+16
+13
+11
+10
+13
+14
+14
+13
+13
+15
+11
+15
+15
+12
+13
+15
+15
+14
+10
+14
+15
+15
+13
+13
+13
+13
+15
+14
+15
+13
+11
+12
+11
+10
+11
+10
+15
+14
+14
+15
+13
+11
+12
+15
+11
+10
+11
+13
+15
+13
+13
+15
+14
+15
+15
+13
+13
+13
+10
+11
+13
+11
+11
+15
+15
+12
+13
+13
+11
+12
+14
+12
+14
+14
+10
+10
+14
+12
+10
+15
+13
+13
+13
+11
+13
+11
+15
+12
+10
+15
+13
+11
+11
+15
+13
+12
+15
+13
+15
+11
+12
+13
+13
+15
+13
+13
+15
+13
+15
+15
+15
+13
+12
+13
+13
+13
+15
+13
+13
+13
+15
+10
+13
+13
+12
+10
+12
+13
+15
+15
+13
+13
+12
+13
+11
+15
+13
+11
+13
+11
+15
+12
+13
+13
+11
+10
+14
+13
+15
+15
+13
+13
+13
+15
+15
+10
+14
+12
+14
+12
+13
+11
+10
+15
+13
+16
+13
+15
+14
+13
+15
+13
+13
+13
+10
+12
+10
+13
+14
+13
+15
+11
+12
+15
+13
+10
+13
+13
+13
+15
+13
+11
+12
+10
+13
+13
+15
+13
+14
+15
+15
+13
+13
+11
+14
+13
+15
+14
+10
+13
+11
+11
+15
+13
+15
+12
+13
+15
+12
+13
+10
+11
+11
+13
+13
+15
+13
+13
+12
+15
+13
+10
+11
+12
+10
+12
+11
+13
+10
+14
+15
+12
+14
+12
+12
+10
+11
+14
+14
+14
+15
+15
+14
+14
+15
+15
+11
+10
+15
+11
+14
+11
+14
+11
+14
+15
+15
+15
+13
+13
+13
+11
+12
+13
+12
+12
+15
+13
+13
+15
+13
+13
+13
+10
+10
+14
+11
+13
+11
+13
+13
+15
+15
+15
+13
+10
+13
+13
+13
+11
+11
+12
+14
+13
+13
+15
+11
+15
+13
+10
+10
+15
+13
+15
+13
+11
+15
+10
+14
+11
+14
+11
+13
+12
+11
+14
+13
+15
+13
+12
+11
+14
+14
+13
+14
+15
+13
+12
+10
+13
+13
+10
+12
+14
+11
+10
+11
+11
+13
+15
+12
+15
+13
+10
+15
+15
+11
+15
+12
+12
+10
+14
+14
+10
+13
+15
+11
+13
+11
+13
+15
+15
+15
+14
+11
+15
+13
+12
+15
+14
+13
+13
+15
+15
+13
+13
+14
+13
+14
+11
+15
+13
+13
+15
+12
+13
+14
+13
+13
+11
+11
+13
+12
+14
+11
+13
+11
+11
+13
+14
+12
+15
+13
+15
+13
+13
+13
+14
+11
+15
+12
+13
+11
+11
+12
+15
+12
+12
+13
+11
+11
+11
+10
+12
+12
+15
+15
+12
+15
+13
+13
+15
+15
+13
+11
+12
+11
+10
+15
+13
+12
+13
+13
+10
+13
+13
+15
+12
+15
+12
+13
+14
+13
+15
+14
+13
+13
+14
+14
+10
+11
+15
+11
+12
+14
+13
+10
+13
+13
+12
+13
+10
+15
+13
+12
+15
+15
+15
+12
+11
+13
+11
+13
+15
+11
+13
+15
+13
+13
+15
+13
+12
+14
+11
+10
+12
+15
+13
+13
+13
+13
+13
+14
+14
+13
+11
+13
+12
+12
+15
+14
+13
+15
+14
+13
+13
+15
+13
+13
+11
+15
+15
+13
+13
+13
+10
+11
+13
+13
+11
+13
+15
+13
+14
+13
+15
+11
+13
+11
+15
+12
+13
+13
+14
+15
+10
+13
+15
+13
+15
+13
+13
+10
+12
+11
+13
+11
+13
+13
+11
+13
+11
+13
+15
+14
+15
+13
+13
+15
+13
+13
+13
+10
+13
+10
+13
+13
+15
+14
+13
+10
+13
+11
+13
+15
+13
+14
+12
+12
+13
+10
+15
+12
+15
+12
+11
+13
+15
+13
+13
+13
+12
+13
+13
+15
+14
+13
+13
+13
+12
+13
+15
+13
+11
+13
+13
+15
+12
+14
+11
+15
+12
+14
+14
+13
+11
+11
+11
+14
+15
+14
+12
+11
+13
+15
+10
+11
+11
+12
+13
+15
+15
+13
+14
+14
+11
+15
+11
+10
+12
+13
+10
+13
+15
+15
+15
+10
+13
+11
+13
+15
+12
+12
+12
+12
+12
+15
+12
diff --git a/sampling_alg_lac2020/figures/selection_count/80_count.txt b/sampling_alg_lac2020/figures/selection_count/80_count.txt
new file mode 100644
index 0000000..46a861c
--- /dev/null
+++ b/sampling_alg_lac2020/figures/selection_count/80_count.txt
@@ -0,0 +1,1015 @@
+15
+15
+13
+13
+12
+12
+11
+11
+11
+11
+11
+11
+10
+11
+11
+10
+11
+11
+11
+11
+10
+11
+10
+11
+11
+12
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+10
+10
+11
+11
+11
+11
+11
+10
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+10
+10
+10
+10
+11
+11
+11
+11
+10
+11
+11
+12
+11
+11
+11
+11
+11
+10
+10
+11
+11
+11
+11
+11
+11
+11
+12
+11
+10
+11
+10
+11
+10
+10
+11
+11
+11
+11
+11
+12
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+10
+11
+11
+11
+10
+10
+10
+11
+11
+11
+10
+11
+11
+11
+11
+11
+10
+11
+10
+10
+11
+11
+11
+11
+11
+11
+10
+11
+10
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+10
+11
+10
+11
+11
+11
+11
+10
+10
+11
+11
+12
+11
+11
+11
+12
+11
+10
+12
+11
+11
+11
+10
+11
+12
+10
+10
+10
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+10
+11
+11
+11
+11
+11
+11
+12
+11
+11
+10
+10
+11
+10
+10
+11
+11
+10
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+10
+10
+10
+10
+11
+11
+10
+11
+11
+11
+11
+13
+11
+11
+11
+11
+10
+11
+10
+10
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+12
+11
+11
+11
+10
+10
+11
+11
+11
+11
+10
+11
+11
+10
+10
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+10
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+12
+11
+11
+10
+11
+11
+12
+11
+11
+11
+11
+10
+11
+11
+10
+11
+12
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+10
+11
+10
+11
+11
+11
+11
+11
+11
+10
+10
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+12
+11
+11
+10
+11
+11
+11
+10
+10
+11
+10
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+10
+12
+11
+11
+11
+11
+11
+12
+11
+11
+11
+11
+11
+11
+10
+11
+12
+11
+10
+11
+10
+11
+11
+11
+10
+10
+11
+11
+11
+12
+10
+11
+11
+11
+11
+11
+11
+10
+12
+11
+11
+11
+11
+11
+11
+10
+10
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+10
+11
+11
+12
+11
+11
+11
+10
+12
+11
+11
+10
+11
+11
+10
+10
+11
+10
+11
+11
+11
+11
+11
+10
+11
+11
+10
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+12
+11
+11
+11
+11
+11
+12
+11
+11
+11
+10
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+12
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+10
+11
+11
+11
+10
+10
+11
+11
+10
+11
+10
+11
+11
+10
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+12
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+12
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+10
+11
+11
+10
+11
+11
+12
+11
+10
+12
+10
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+10
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+12
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+12
+11
+11
+11
+11
+11
+11
+11
+11
+12
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+12
+11
+11
+11
+10
+11
+11
+10
+11
+11
+10
+10
+11
+11
+11
+11
+11
+11
+12
+12
+11
+11
+10
+11
+11
+10
+11
+11
+10
+11
+11
+11
+10
+11
+11
+11
+10
+11
+11
+10
+11
+11
+11
+11
+11
+12
+11
+11
+12
+11
+11
+11
+10
+11
+12
+10
+11
+11
+11
+11
+10
+10
+11
+10
+11
+11
+11
+11
+10
+11
+11
+11
+10
+11
+12
+11
+11
+11
+10
+11
+12
+10
+11
+11
+11
+11
+11
+10
+11
+11
+11
+12
+10
+11
+11
+11
+10
+12
+11
+11
+11
+11
+11
+10
+10
+10
+11
+11
+12
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+10
+10
+11
+10
+10
+11
+11
+11
+11
+11
+11
+11
+11
+11
+11
+10
+11
+11
+11
+11
+11
+12
+12
+11
+11
+11
+11
+11
+11
diff --git a/sampling_alg_lac2020/figures/selection_count/calc_stats.py b/sampling_alg_lac2020/figures/selection_count/calc_stats.py
new file mode 100755
index 0000000..b192b72
--- /dev/null
+++ b/sampling_alg_lac2020/figures/selection_count/calc_stats.py
@@ -0,0 +1,19 @@
+#!/usr/bin/python3
+import sys
+
+#  if len(sys.argv) != 2:
+#          print("Wrong number of arguments.")
+#          print("USAGE: ./calc_stats.py <input_file>")
+#          quit()
+
+files = ["112_count.txt", "16_count.txt", "48_count.txt", "80_count.txt", "sweep_count.txt"]
+for input_file in files:
+	print(input_file)
+
+	f = open(input_file)
+	X = [int(i) for i in f.readlines()]
+
+	mean = float(sum(X))/len(X)
+	stddev = float(sum([x**2 for x in X]))/len(X) - mean**2
+
+	print("{0:.2f}".format(mean) + " " + "{0:.2f}".format(stddev))
diff --git a/sampling_alg_lac2020/figures/selection_count/sweep_count.txt b/sampling_alg_lac2020/figures/selection_count/sweep_count.txt
new file mode 100644
index 0000000..4e627b1
--- /dev/null
+++ b/sampling_alg_lac2020/figures/selection_count/sweep_count.txt
@@ -0,0 +1,1016 @@
+13
+14
+15
+15
+15
+16
+18
+12
+12
+13
+12
+11
+13
+12
+11
+11
+12
+13
+11
+9
+8
+6
+10
+12
+13
+9
+9
+10
+9
+9
+6
+6
+9
+7
+8
+9
+9
+7
+11
+12
+12
+13
+14
+12
+11
+7
+9
+8
+4
+4
+7
+5
+6
+7
+9
+7
+9
+8
+9
+9
+9
+7
+7
+7
+7
+5
+9
+6
+4
+5
+6
+8
+7
+7
+7
+10
+10
+9
+12
+10
+9
+10
+11
+11
+10
+11
+9
+8
+6
+7
+5
+5
+5
+5
+6
+6
+6
+6
+6
+5
+6
+7
+7
+7
+6
+5
+5
+4
+4
+3
+4
+4
+4
+4
+4
+4
+3
+3
+4
+4
+5
+5
+4
+4
+4
+4
+3
+8
+11
+7
+6
+6
+7
+4
+5
+6
+8
+7
+8
+8
+7
+7
+6
+5
+7
+6
+4
+4
+9
+9
+7
+7
+9
+7
+4
+9
+5
+5
+3
+6
+6
+6
+7
+7
+11
+5
+11
+6
+13
+11
+9
+7
+9
+4
+10
+5
+6
+5
+6
+7
+9
+7
+9
+8
+9
+9
+9
+8
+7
+7
+7
+8
+6
+6
+4
+5
+6
+7
+7
+7
+7
+10
+10
+8
+12
+10
+9
+11
+11
+10
+10
+9
+9
+6
+8
+7
+5
+5
+6
+5
+5
+5
+6
+6
+6
+5
+6
+6
+7
+7
+6
+6
+5
+5
+5
+4
+5
+4
+4
+4
+3
+4
+3
+3
+4
+4
+5
+5
+4
+4
+4
+3
+3
+3
+8
+11
+8
+6
+6
+7
+4
+5
+4
+6
+9
+10
+8
+7
+8
+5
+5
+8
+6
+5
+5
+7
+10
+6
+5
+8
+7
+3
+4
+3
+5
+3
+6
+7
+6
+7
+7
+11
+10
+9
+8
+11
+12
+8
+7
+9
+7
+2
+3
+7
+5
+6
+9
+9
+8
+9
+8
+9
+9
+9
+9
+7
+7
+7
+5
+7
+6
+4
+5
+6
+6
+7
+7
+8
+10
+10
+12
+9
+8
+9
+10
+11
+11
+11
+11
+8
+6
+6
+7
+6
+5
+6
+7
+6
+5
+6
+6
+6
+6
+6
+7
+7
+7
+6
+5
+5
+6
+5
+4
+5
+4
+4
+4
+4
+4
+3
+3
+4
+4
+4
+5
+4
+4
+4
+4
+3
+3
+8
+9
+6
+6
+4
+7
+4
+5
+4
+9
+7
+10
+6
+9
+9
+8
+10
+8
+6
+4
+6
+9
+10
+9
+8
+9
+8
+7
+8
+5
+6
+6
+7
+8
+9
+9
+7
+11
+10
+9
+13
+8
+11
+11
+7
+9
+9
+2
+3
+3
+5
+4
+6
+5
+7
+6
+8
+8
+9
+9
+9
+7
+7
+7
+5
+9
+5
+4
+5
+6
+6
+7
+7
+10
+10
+10
+9
+11
+10
+8
+10
+11
+11
+10
+11
+8
+6
+9
+7
+5
+5
+6
+7
+6
+5
+6
+6
+5
+6
+6
+7
+7
+5
+6
+5
+5
+5
+5
+4
+4
+4
+4
+4
+5
+4
+4
+3
+4
+4
+5
+5
+5
+4
+4
+4
+3
+3
+8
+8
+5
+6
+4
+6
+4
+5
+6
+9
+9
+6
+8
+7
+9
+5
+7
+7
+6
+4
+5
+9
+8
+7
+9
+9
+7
+7
+2
+5
+2
+5
+5
+6
+7
+7
+7
+8
+10
+9
+8
+10
+11
+11
+7
+8
+6
+3
+4
+4
+5
+6
+8
+9
+9
+9
+8
+8
+9
+9
+9
+7
+7
+7
+8
+9
+6
+7
+8
+6
+7
+7
+7
+7
+10
+10
+12
+12
+9
+9
+10
+11
+10
+10
+11
+6
+7
+8
+7
+4
+5
+6
+7
+6
+6
+6
+6
+6
+5
+6
+6
+7
+7
+6
+5
+5
+5
+4
+4
+4
+4
+4
+4
+4
+4
+4
+3
+4
+4
+4
+5
+4
+4
+4
+4
+3
+3
+8
+6
+12
+4
+4
+3
+4
+5
+6
+7
+9
+6
+8
+8
+9
+5
+4
+4
+6
+6
+6
+6
+10
+10
+9
+8
+7
+7
+9
+7
+6
+6
+6
+8
+7
+7
+7
+11
+10
+9
+9
+11
+11
+7
+10
+9
+9
+2
+3
+3
+5
+4
+7
+5
+7
+6
+8
+8
+9
+9
+9
+8
+7
+7
+7
+6
+6
+4
+5
+6
+6
+7
+7
+7
+10
+10
+9
+9
+10
+8
+11
+10
+11
+10
+11
+6
+6
+9
+7
+5
+5
+6
+6
+6
+6
+6
+6
+5
+5
+6
+6
+7
+7
+7
+6
+5
+5
+4
+4
+4
+4
+4
+4
+4
+4
+3
+3
+4
+4
+5
+5
+5
+4
+4
+3
+3
+3
+8
+11
+12
+6
+6
+7
+4
+3
+4
+8
+7
+6
+8
+7
+9
+7
+7
+4
+6
+4
+4
+9
+8
+7
+8
+9
+7
+8
+9
+4
+5
+9
+4
+8
+8
+9
+9
+11
+10
+13
+14
+11
+11
+11
+7
+7
+5
+4
+3
+4
+5
+6
+9
+5
+7
+9
+8
+8
+9
+7
+9
+7
+7
+7
+6
+9
+6
+4
+5
+6
+6
+7
+7
+9
+10
+10
+11
+12
+9
+8
+11
+11
+11
+10
+10
+9
+8
+7
+7
+6
+5
+6
+7
+6
+6
+6
+6
+5
+6
+6
+6
+7
+5
+6
+5
+5
+5
+4
+4
+5
+4
+4
+4
+5
+4
+3
+3
+4
+4
+5
+5
+4
+4
+4
+4
+3
+3
+8
+10
+6
+4
+4
+7
+4
+3
+6
+7
+7
+10
+5
+7
+7
+5
+4
+5
+6
+4
+6
+6
+8
+7
+8
+6
+3
+7
+5
+5
+5
+5
+6
+6
+8
+6
+6
+6
+10
+8
+12
+11
+11
+7
+7
+9
+6
+4
+4
+6
+5
+4
+7
+5
+7
+6
+8
+8
+9
+9
+9
+7
+7
+7
+8
+9
+6
+7
+6
+6
+6
+7
+7
+7
+10
+10
+11
+10
+8
+9
+10
+11
+10
+10
+11
+9
+6
+6
+7
+5
+5
+6
+7
+5
+6
+6
+6
+5
+5
+6
+6
+7
+7
+6
+5
+5
+6
+4
+4
+5
+4
+4
+4
+4
+4
+3
+3
+4
+4
+5
+4
+4
+4
+4
+4
+3
+3
diff --git a/sampling_alg_lac2020/midi_tests/run_tests.sh b/sampling_alg_lac2020/midi_tests/run_tests.sh
index 556a3ac..bcf29ff 100755
--- a/sampling_alg_lac2020/midi_tests/run_tests.sh
+++ b/sampling_alg_lac2020/midi_tests/run_tests.sh
@@ -27,5 +27,8 @@ elif [ "$alg" = "new" ]; then
 	parameters="-I speed=4 -p close=.9,diverse=0.04,random=0.01 -x -X attack=0,release=0,stddev=0"
 fi
 
-$bin -i midifile -I file=$midifile -I midimap=$midimap $parameters -o wavfile -O file="$output" $kit | grep "index: " | awk '{print $8}' | sed 's/.$//' > "$output"
-	sort -n "$output" | uniq -c | awk '{print $2 " " $1}'
+# $bin -i midifile -I file=$midifile -I midimap=$midimap $parameters -o wavfile -O file="$output" $kit | grep "index: " | awk '{print $8}' | sed 's/.$//' > "$output"
+# sort -n "$output" | uniq -c | awk '{print $2 " " $1}'
+
+$bin -i midifile -I file=$midifile -I midimap=$midimap $parameters -o dummy $kit | grep "index: " | awk '{print $20}' > "$output"
+# sort -n "$output" | uniq -c | awk '{print $2 " " $1}'
diff --git a/sampling_alg_lac2020/midi_tests/test_and_plot.sh b/sampling_alg_lac2020/midi_tests/test_and_plot.sh
index 2c9ac32..34c2bc1 100755
--- a/sampling_alg_lac2020/midi_tests/test_and_plot.sh
+++ b/sampling_alg_lac2020/midi_tests/test_and_plot.sh
@@ -1,32 +1,32 @@
 # new
-# ./run_tests.sh rise_0_127_8.mid new sweep_new_output.txt
-./plot_histogram.py sweep_new_output.txt sweep_new.pdf
+./run_tests.sh rise_0_127_8.mid new sweep_count.txt
+# ./plot_histogram.py sweep_new_output.txt sweep_new.pdf
 
-# ./run_tests.sh 16_1016.mid new 16_new_output.txt
-./plot_histogram.py 16_new_output.txt 16_new.pdf
+./run_tests.sh 16_1016.mid new 16_count.txt
+# ./plot_histogram.py 16_new_output.txt 16_new.pdf
 
-# ./run_tests.sh 48_1016.mid new 48_new_output.txt
-./plot_histogram.py 48_new_output.txt 48_new.pdf
+./run_tests.sh 48_1016.mid new 48_count.txt
+# ./plot_histogram.py 48_new_output.txt 48_new.pdf
 
-# ./run_tests.sh 80_1016.mid new 80_new_output.txt
-./plot_histogram.py 80_new_output.txt 80_new.pdf
+./run_tests.sh 80_1016.mid new 80_count.txt
+# ./plot_histogram.py 80_new_output.txt 80_new.pdf
 
-# ./run_tests.sh 112_1016.mid new 112_new_output.txt
-./plot_histogram.py 112_new_output.txt 112_new.pdf
+./run_tests.sh 112_1016.mid new 112_count.txt
+# ./plot_histogram.py 112_new_output.txt 112_new.pdf
 
 
 # old
-# ./run_tests.sh rise_0_127_8.mid old sweep_old_output.txt
-./plot_histogram.py sweep_old_output.txt sweep_old.pdf
-
-# ./run_tests.sh 16_1016.mid old 16_old_output.txt
-./plot_histogram.py 16_old_output.txt 16_old.pdf
-
-# ./run_tests.sh 48_1016.mid old 48_old_output.txt
-./plot_histogram.py 48_old_output.txt 48_old.pdf
-
-# ./run_tests.sh 80_1016.mid old 80_old_output.txt
-./plot_histogram.py 80_old_output.txt 80_old.pdf
-
-# ./run_tests.sh 112_1016.mid old 112_old_output.txt
-./plot_histogram.py 112_old_output.txt 112_old.pdf
+# # ./run_tests.sh rise_0_127_8.mid old sweep_old_output.txt
+# ./plot_histogram.py sweep_old_output.txt sweep_old.pdf
+# 
+# # ./run_tests.sh 16_1016.mid old 16_old_output.txt
+# ./plot_histogram.py 16_old_output.txt 16_old.pdf
+# 
+# # ./run_tests.sh 48_1016.mid old 48_old_output.txt
+# ./plot_histogram.py 48_old_output.txt 48_old.pdf
+# 
+# # ./run_tests.sh 80_1016.mid old 80_old_output.txt
+# ./plot_histogram.py 80_old_output.txt 80_old.pdf
+# 
+# # ./run_tests.sh 112_1016.mid old 112_old_output.txt
+# ./plot_histogram.py 112_old_output.txt 112_old.pdf
-- 
cgit v1.2.3