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(-) (limited to 'evaluate.py') 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(-) (limited to 'evaluate.py') 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