From 4a6650f5e231b0d1a62feb87716fbca9f5ef2a80 Mon Sep 17 00:00:00 2001 From: nunzip Date: Mon, 10 Dec 2018 16:31:40 +0000 Subject: Fix notations --- report2/fig/allbaselines.pdf | Bin 14303 -> 15002 bytes report2/fig/baseline.pdf | Bin 11968 -> 14200 bytes report2/fig/clusteracc.pdf | Bin 15895 -> 14898 bytes report2/fig/comparison.pdf | Bin 14810 -> 14872 bytes report2/fig/kmeanacc.pdf | Bin 13787 -> 13948 bytes report2/fig/lambda_acc.pdf | Bin 14121 -> 13808 bytes report2/fig/lambda_acc_tr.pdf | Bin 14144 -> 13822 bytes report2/fig/pqvals.pdf | Bin 14299 -> 14356 bytes report2/fig/trainpqvals.pdf | Bin 14298 -> 14355 bytes 9 files changed, 0 insertions(+), 0 deletions(-) diff --git a/report2/fig/allbaselines.pdf b/report2/fig/allbaselines.pdf index 2abbb57..15b1aff 100644 Binary files a/report2/fig/allbaselines.pdf and b/report2/fig/allbaselines.pdf differ diff --git a/report2/fig/baseline.pdf b/report2/fig/baseline.pdf index 8c57f05..8ff560b 100644 Binary files a/report2/fig/baseline.pdf and b/report2/fig/baseline.pdf differ diff --git a/report2/fig/clusteracc.pdf b/report2/fig/clusteracc.pdf index 054127b..09459c4 100644 Binary files a/report2/fig/clusteracc.pdf and b/report2/fig/clusteracc.pdf differ diff --git a/report2/fig/comparison.pdf b/report2/fig/comparison.pdf index 7d65092..693f08d 100644 Binary files a/report2/fig/comparison.pdf and b/report2/fig/comparison.pdf differ diff --git a/report2/fig/kmeanacc.pdf b/report2/fig/kmeanacc.pdf index 4d1ab8e..4b6e33b 100644 Binary files a/report2/fig/kmeanacc.pdf and b/report2/fig/kmeanacc.pdf differ diff --git a/report2/fig/lambda_acc.pdf b/report2/fig/lambda_acc.pdf index 9d6027e..9c3f749 100644 Binary files a/report2/fig/lambda_acc.pdf and b/report2/fig/lambda_acc.pdf differ diff --git a/report2/fig/lambda_acc_tr.pdf b/report2/fig/lambda_acc_tr.pdf index 4ae3473..8041977 100644 Binary files a/report2/fig/lambda_acc_tr.pdf and b/report2/fig/lambda_acc_tr.pdf differ diff --git a/report2/fig/pqvals.pdf b/report2/fig/pqvals.pdf index 425891c..43cccdb 100644 Binary files a/report2/fig/pqvals.pdf and b/report2/fig/pqvals.pdf differ diff --git a/report2/fig/trainpqvals.pdf b/report2/fig/trainpqvals.pdf index 800b3da..210fea4 100644 Binary files a/report2/fig/trainpqvals.pdf and b/report2/fig/trainpqvals.pdf differ -- cgit v1.2.3-54-g00ecf From b9bc3e045e1244183b76682a5f4be2c3e693d517 Mon Sep 17 00:00:00 2001 From: nunzip Date: Mon, 10 Dec 2018 16:32:37 +0000 Subject: Fix standard p-q and fix notation for comparison multrank --- evaluate.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/evaluate.py b/evaluate.py index 5948acc..7808c2e 100755 --- a/evaluate.py +++ b/evaluate.py @@ -42,8 +42,8 @@ parser.add_argument("-k", "--kmean", help="Perform Kmeans", action='store_true', parser.add_argument("-m", "--mahalanobis", help="Perform Mahalanobis Distance metric", action='store_true', default=0) parser.add_argument("-e", "--euclidean", help="Standard euclidean", action='store_true', default=0) 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("-p", "--reranka", help="Parameter 1 for Rerank", type=int, default = 9) +parser.add_argument("-q", "--rerankb", help="Parameter 2 for rerank", type=int, default = 5) 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') @@ -249,9 +249,9 @@ def main(): plt.plot(test_table[:(args.multrank)], 100*accuracy[0]) if(args.comparison!=1): plt.plot(test_table[:(args.multrank)], 100*accuracy[1]) - plt.legend(['Baseline kNN', 'Improved metric'], loc='upper left') - plt.xlabel('k rank') - plt.ylabel('Recognition Accuracy (%)') + plt.legend(['Baseline NN', 'NN+Reranking'], loc='upper left') + plt.xlabel('Top k') + plt.ylabel('Identification Accuracy (%)') plt.grid(True) plt.show() -- cgit v1.2.3-54-g00ecf From e26b58f276ddf2a5e40c7dafe8b5df9d4ae04ce9 Mon Sep 17 00:00:00 2001 From: nunzip Date: Mon, 10 Dec 2018 16:44:42 +0000 Subject: Fix k2 standardval --- evaluate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evaluate.py b/evaluate.py index 3b420db..54a6a9d 100755 --- a/evaluate.py +++ b/evaluate.py @@ -43,7 +43,7 @@ parser.add_argument("-m", "--mahalanobis", help="Perform Mahalanobis Distance me parser.add_argument("-e", "--euclidean", help="Standard euclidean", action='store_true', default=0) 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 = 9) -parser.add_argument("-q", "--rerankb", help="Parameter 2 for rerank", type=int, default = 5) +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=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') -- cgit v1.2.3-54-g00ecf From 21de92877fe5453009d468d37cb1c54935ad9419 Mon Sep 17 00:00:00 2001 From: nunzip Date: Mon, 10 Dec 2018 16:45:03 +0000 Subject: Change comparison value --- report2/fig/comparison.pdf | Bin 14872 -> 14877 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/report2/fig/comparison.pdf b/report2/fig/comparison.pdf index 693f08d..e755c10 100644 Binary files a/report2/fig/comparison.pdf and b/report2/fig/comparison.pdf differ -- cgit v1.2.3-54-g00ecf