diff options
| -rwxr-xr-x | evaluate.py | 8 | ||||
| -rw-r--r-- | report2/fig/allbaselines.pdf | bin | 14303 -> 15002 bytes | |||
| -rw-r--r-- | report2/fig/baseline.pdf | bin | 11968 -> 14200 bytes | |||
| -rw-r--r-- | report2/fig/clusteracc.pdf | bin | 15895 -> 14898 bytes | |||
| -rw-r--r-- | report2/fig/comparison.pdf | bin | 14810 -> 14877 bytes | |||
| -rw-r--r-- | report2/fig/kmeanacc.pdf | bin | 13787 -> 13948 bytes | |||
| -rw-r--r-- | report2/fig/lambda_acc.pdf | bin | 14121 -> 13808 bytes | |||
| -rw-r--r-- | report2/fig/lambda_acc_tr.pdf | bin | 14144 -> 13822 bytes | |||
| -rw-r--r-- | report2/fig/pqvals.pdf | bin | 14299 -> 14356 bytes | |||
| -rw-r--r-- | report2/fig/trainpqvals.pdf | bin | 14298 -> 14355 bytes |
10 files changed, 4 insertions, 4 deletions
diff --git a/evaluate.py b/evaluate.py index 251e952..54a6a9d 100755 --- a/evaluate.py +++ b/evaluate.py @@ -42,7 +42,7 @@ 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("-p", "--reranka", help="Parameter 1 for Rerank", type=int, default = 9) 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) @@ -250,9 +250,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() diff --git a/report2/fig/allbaselines.pdf b/report2/fig/allbaselines.pdf Binary files differindex 2abbb57..15b1aff 100644 --- a/report2/fig/allbaselines.pdf +++ b/report2/fig/allbaselines.pdf diff --git a/report2/fig/baseline.pdf b/report2/fig/baseline.pdf Binary files differindex 8c57f05..8ff560b 100644 --- a/report2/fig/baseline.pdf +++ b/report2/fig/baseline.pdf diff --git a/report2/fig/clusteracc.pdf b/report2/fig/clusteracc.pdf Binary files differindex 054127b..09459c4 100644 --- a/report2/fig/clusteracc.pdf +++ b/report2/fig/clusteracc.pdf diff --git a/report2/fig/comparison.pdf b/report2/fig/comparison.pdf Binary files differindex 7d65092..e755c10 100644 --- a/report2/fig/comparison.pdf +++ b/report2/fig/comparison.pdf diff --git a/report2/fig/kmeanacc.pdf b/report2/fig/kmeanacc.pdf Binary files differindex 4d1ab8e..4b6e33b 100644 --- a/report2/fig/kmeanacc.pdf +++ b/report2/fig/kmeanacc.pdf diff --git a/report2/fig/lambda_acc.pdf b/report2/fig/lambda_acc.pdf Binary files differindex 9d6027e..9c3f749 100644 --- a/report2/fig/lambda_acc.pdf +++ b/report2/fig/lambda_acc.pdf diff --git a/report2/fig/lambda_acc_tr.pdf b/report2/fig/lambda_acc_tr.pdf Binary files differindex 4ae3473..8041977 100644 --- a/report2/fig/lambda_acc_tr.pdf +++ b/report2/fig/lambda_acc_tr.pdf diff --git a/report2/fig/pqvals.pdf b/report2/fig/pqvals.pdf Binary files differindex 425891c..43cccdb 100644 --- a/report2/fig/pqvals.pdf +++ b/report2/fig/pqvals.pdf diff --git a/report2/fig/trainpqvals.pdf b/report2/fig/trainpqvals.pdf Binary files differindex 800b3da..210fea4 100644 --- a/report2/fig/trainpqvals.pdf +++ b/report2/fig/trainpqvals.pdf |