From 8b04072ed596da25ab9c695b09df5ccb5f01353f Mon Sep 17 00:00:00 2001 From: nunzip Date: Sun, 9 Dec 2018 22:35:32 +0000 Subject: Add figures --- report2/fig/allbaselines.pdf | Bin 0 -> 14303 bytes report2/fig/baseline.pdf | Bin 11539 -> 11968 bytes report2/fig/cdist.pdf | Bin 0 -> 11631 bytes report2/fig/clusteracc.pdf | Bin 0 -> 15895 bytes report2/fig/comparison.pdf | Bin 14388 -> 14810 bytes report2/fig/eucranklist.png | Bin 3880590 -> 3137716 bytes report2/fig/jaccard.pdf | Bin 0 -> 12026 bytes report2/fig/kmeanacc.pdf | Bin 0 -> 13787 bytes report2/fig/mAP.pdf | Bin 0 -> 14023 bytes report2/fig/mahalanobis.pdf | Bin 0 -> 41611 bytes report2/fig/pqvals.pdf | Bin 13873 -> 14299 bytes report2/fig/ranklist.png | Bin 2739729 -> 2836148 bytes report2/fig/subspace.pdf | Bin 0 -> 10339 bytes report2/fig/trainpqvals.pdf | Bin 0 -> 14298 bytes report2/paper.md | 36 +++++++++++++++++++++++++++++++++++- report2/template.latex | 1 + 16 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 report2/fig/allbaselines.pdf create mode 100644 report2/fig/cdist.pdf create mode 100644 report2/fig/clusteracc.pdf create mode 100644 report2/fig/jaccard.pdf create mode 100644 report2/fig/kmeanacc.pdf create mode 100644 report2/fig/mAP.pdf create mode 100644 report2/fig/mahalanobis.pdf create mode 100644 report2/fig/subspace.pdf create mode 100644 report2/fig/trainpqvals.pdf diff --git a/report2/fig/allbaselines.pdf b/report2/fig/allbaselines.pdf new file mode 100644 index 0000000..2abbb57 Binary files /dev/null and b/report2/fig/allbaselines.pdf differ diff --git a/report2/fig/baseline.pdf b/report2/fig/baseline.pdf index e6a4794..8c57f05 100644 Binary files a/report2/fig/baseline.pdf and b/report2/fig/baseline.pdf differ diff --git a/report2/fig/cdist.pdf b/report2/fig/cdist.pdf new file mode 100644 index 0000000..78f6fed Binary files /dev/null and b/report2/fig/cdist.pdf differ diff --git a/report2/fig/clusteracc.pdf b/report2/fig/clusteracc.pdf new file mode 100644 index 0000000..054127b Binary files /dev/null and b/report2/fig/clusteracc.pdf differ diff --git a/report2/fig/comparison.pdf b/report2/fig/comparison.pdf index 8e202fa..7d65092 100644 Binary files a/report2/fig/comparison.pdf and b/report2/fig/comparison.pdf differ diff --git a/report2/fig/eucranklist.png b/report2/fig/eucranklist.png index 9daaa9c..3f03a73 100644 Binary files a/report2/fig/eucranklist.png and b/report2/fig/eucranklist.png differ diff --git a/report2/fig/jaccard.pdf b/report2/fig/jaccard.pdf new file mode 100644 index 0000000..53cf407 Binary files /dev/null and b/report2/fig/jaccard.pdf differ diff --git a/report2/fig/kmeanacc.pdf b/report2/fig/kmeanacc.pdf new file mode 100644 index 0000000..4d1ab8e Binary files /dev/null and b/report2/fig/kmeanacc.pdf differ diff --git a/report2/fig/mAP.pdf b/report2/fig/mAP.pdf new file mode 100644 index 0000000..0cf7156 Binary files /dev/null and b/report2/fig/mAP.pdf differ diff --git a/report2/fig/mahalanobis.pdf b/report2/fig/mahalanobis.pdf new file mode 100644 index 0000000..2362cfa Binary files /dev/null and b/report2/fig/mahalanobis.pdf differ diff --git a/report2/fig/pqvals.pdf b/report2/fig/pqvals.pdf index c43641e..425891c 100644 Binary files a/report2/fig/pqvals.pdf and b/report2/fig/pqvals.pdf differ diff --git a/report2/fig/ranklist.png b/report2/fig/ranklist.png index 86ecb6b..1cb2647 100644 Binary files a/report2/fig/ranklist.png and b/report2/fig/ranklist.png differ diff --git a/report2/fig/subspace.pdf b/report2/fig/subspace.pdf new file mode 100644 index 0000000..2ab1f5b Binary files /dev/null and b/report2/fig/subspace.pdf differ diff --git a/report2/fig/trainpqvals.pdf b/report2/fig/trainpqvals.pdf new file mode 100644 index 0000000..800b3da Binary files /dev/null and b/report2/fig/trainpqvals.pdf differ 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 -- cgit v1.2.3-54-g00ecf From 090dd1eebc60fbbad5c687ece1aac0782713636f Mon Sep 17 00:00:00 2001 From: nunzip Date: Mon, 10 Dec 2018 02:36:36 +0000 Subject: Add lambda plots --- report2/fig/lambda_acc.pdf | Bin 0 -> 13697 bytes report2/fig/lamda_acc_tr.pdf | Bin 0 -> 13719 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 report2/fig/lambda_acc.pdf create mode 100644 report2/fig/lamda_acc_tr.pdf diff --git a/report2/fig/lambda_acc.pdf b/report2/fig/lambda_acc.pdf new file mode 100644 index 0000000..7cac239 Binary files /dev/null and b/report2/fig/lambda_acc.pdf differ diff --git a/report2/fig/lamda_acc_tr.pdf b/report2/fig/lamda_acc_tr.pdf new file mode 100644 index 0000000..cb06075 Binary files /dev/null and b/report2/fig/lamda_acc_tr.pdf differ -- cgit v1.2.3-54-g00ecf From 73b3f57c7059656d16c361dc4565e9d6af485c87 Mon Sep 17 00:00:00 2001 From: nunzip Date: Mon, 10 Dec 2018 02:37:21 +0000 Subject: Change lamda float --- evaluate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evaluate.py b/evaluate.py index 9218649..7a5e3ca 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) -- cgit v1.2.3-54-g00ecf