Merge branch 'master' of skozl.com:e4-pattern

19 files changed, 37 insertions, 2 deletions

diff --git a/evaluate.py b/evaluate.py
index 9910360..5948acc 100755
--- a/evaluate.py
+++ b/evaluate.py
@@ -44,7 +44,7 @@ parser.add_argument("-e", "--euclidean", help="Standard euclidean", action='stor
 parser.add_argument("-r", "--rerank", help="Use k-reciprocal rernaking", action='store_true')
 parser.add_argument("-p", "--reranka", help="Parameter 1 for Rerank", type=int, default = 11)
 parser.add_argument("-q", "--rerankb", help="Parameter 2 for rerank", type=int, default = 3)
-parser.add_argument("-l", "--rerankl", help="Coefficient to combine distances", type=int, default = 0.3)
+parser.add_argument("-l", "--rerankl", help="Coefficient to combine distances", type=float, default = 0.3)
 parser.add_argument("-n", "--neighbors", help="Number of neighbors", type=int, default = 1)
 parser.add_argument("-v", "--verbose", help="Use verbose output", action='store_true')
 parser.add_argument("-s", "--showrank", help="Save ranklist pic id in a txt file", type=int, default = 0)
diff --git a/report2/fig/allbaselines.pdf b/report2/fig/allbaselines.pdf
new file mode 100644
index 0000000..2abbb57
--- /dev/null
+++ b/report2/fig/allbaselines.pdf
diff --git a/report2/fig/baseline.pdf b/report2/fig/baseline.pdf
index e6a4794..8c57f05 100644
--- a/report2/fig/baseline.pdf
+++ b/report2/fig/baseline.pdf
diff --git a/report2/fig/cdist.pdf b/report2/fig/cdist.pdf
new file mode 100644
index 0000000..78f6fed
--- /dev/null
+++ b/report2/fig/cdist.pdf
diff --git a/report2/fig/clusteracc.pdf b/report2/fig/clusteracc.pdf
new file mode 100644
index 0000000..054127b
--- /dev/null
+++ b/report2/fig/clusteracc.pdf
diff --git a/report2/fig/comparison.pdf b/report2/fig/comparison.pdf
index 8e202fa..7d65092 100644
--- a/report2/fig/comparison.pdf
+++ b/report2/fig/comparison.pdf
diff --git a/report2/fig/eucranklist.png b/report2/fig/eucranklist.png
index 9daaa9c..3f03a73 100644
--- a/report2/fig/eucranklist.png
+++ b/report2/fig/eucranklist.png
diff --git a/report2/fig/jaccard.pdf b/report2/fig/jaccard.pdf
new file mode 100644
index 0000000..53cf407
--- /dev/null
+++ b/report2/fig/jaccard.pdf
diff --git a/report2/fig/kmeanacc.pdf b/report2/fig/kmeanacc.pdf
new file mode 100644
index 0000000..4d1ab8e
--- /dev/null
+++ b/report2/fig/kmeanacc.pdf
diff --git a/report2/fig/lambda_acc.pdf b/report2/fig/lambda_acc.pdf
new file mode 100644
index 0000000..7cac239
--- /dev/null
+++ b/report2/fig/lambda_acc.pdf
diff --git a/report2/fig/lamda_acc_tr.pdf b/report2/fig/lamda_acc_tr.pdf
new file mode 100644
index 0000000..cb06075
--- /dev/null
+++ b/report2/fig/lamda_acc_tr.pdf
diff --git a/report2/fig/mAP.pdf b/report2/fig/mAP.pdf
new file mode 100644
index 0000000..0cf7156
--- /dev/null
+++ b/report2/fig/mAP.pdf
diff --git a/report2/fig/mahalanobis.pdf b/report2/fig/mahalanobis.pdf
new file mode 100644
index 0000000..2362cfa
--- /dev/null
+++ b/report2/fig/mahalanobis.pdf
diff --git a/report2/fig/pqvals.pdf b/report2/fig/pqvals.pdf
index c43641e..425891c 100644
--- a/report2/fig/pqvals.pdf
+++ b/report2/fig/pqvals.pdf
diff --git a/report2/fig/ranklist.png b/report2/fig/ranklist.png
index 86ecb6b..1cb2647 100644
--- a/report2/fig/ranklist.png
+++ b/report2/fig/ranklist.png
diff --git a/report2/fig/subspace.pdf b/report2/fig/subspace.pdf
new file mode 100644
index 0000000..2ab1f5b
--- /dev/null
+++ b/report2/fig/subspace.pdf
diff --git a/report2/fig/trainpqvals.pdf b/report2/fig/trainpqvals.pdf
new file mode 100644
index 0000000..800b3da
--- /dev/null
+++ b/report2/fig/trainpqvals.pdf
diff --git a/report2/paper.md b/report2/paper.md
index 14f2f98..0ceeedd 100755
--- a/report2/paper.md
+++ b/report2/paper.md
@@ -45,14 +45,48 @@ EXPLAIN KNN BRIEFLY
 
 \begin{figure}
 \begin{center}
-\includegraphics[width=17em]{fig/baseline.pdf}
+\includegraphics[width=20em]{fig/baseline.pdf}
 \caption{Recognition accuracy of baseline Nearest Neighbor @rank k}
 \label{fig:baselineacc}
 \end{center}
 \end{figure}
 
+\begin{figure}
+\begin{center}
+\includegraphics[width=22em]{fig/eucranklist.png}
+\caption{Ranklist @rank10 generated for 5 query images}
+\label{fig:eucrank}
+\end{center}
+\end{figure}
+
+
 # Suggested Improvement
 
+\begin{figure}
+\begin{center}
+\includegraphics[width=24em]{fig/ranklist.png}
+\caption{Ranklist (improved method) @rank10 generated for 5 query images}
+\label{fig:ranklist2}
+\end{center}
+\end{figure}
+
+\begin{figure}
+\begin{center}
+\includegraphics[width=20em]{fig/comparison.pdf}
+\caption{Comparison of recognition accuracy @rank k}
+\label{fig:baselineacc}
+\end{center}
+\end{figure}
+
+\begin{figure}
+\begin{center}
+\includegraphics[width=17em]{fig/pqvals.pdf}
+\caption{Recognition accuracy varying K1 and K2}
+\label{fig:pqvals}
+\end{center}
+\end{figure}
+
+
 # Conclusion
 
 # References
diff --git a/report2/template.latex b/report2/template.latex
index 4520e03..49b4963 100644
--- a/report2/template.latex
+++ b/report2/template.latex
@@ -126,6 +126,7 @@ $if(tables)$
 % Fix footnotes in tables (requires footnote package)
 \IfFileExists{footnote.sty}{\usepackage{footnote}\makesavenoteenv{long table}}{}
 $endif$
+\usepackage{graphicx}
 $if(graphics)$
 \usepackage{graphicx,grffile}
 \makeatletter