Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Make some vars more consistent
  • Loading branch information
oleg-alexandrov committed Dec 1, 2014
1 parent 7d720e3 commit 87209ba
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
10 changes: 5 additions & 5 deletions VocabBuildDB/VocabBuildDB.cpp
Expand Up @@ -99,8 +99,8 @@ unsigned char *ReadAndFilterKeys(const char *keyfile, int dim,
int main(int argc, char **argv)
{
if (argc < 4 || argc > 8) {
printf("Usage: %s <list.in> <tree.in> <tree.out> [use_tfidf:1] "
"[normalize:1] [start_id:0] [distance_type:1]\n",
printf("Usage: %s <list.in> <tree.in> <db.out> [use_tfidf:1] "
"[normalize:1] [start_id:0] [distance_type:1]\n",
argv[0]);

return 1;
Expand All @@ -112,7 +112,7 @@ int main(int argc, char **argv)

char *list_in = argv[1];
char *tree_in = argv[2];
char *tree_out = argv[3];
char *db_out = argv[3];
DistanceType distance_type = DistanceMin;
int start_id = 0;

Expand Down Expand Up @@ -202,8 +202,8 @@ int main(int argc, char **argv)
if (normalize)
tree.NormalizeDatabase(start_id, num_db_images);

printf("[VocabBuildDB] Writing tree...\n");
tree.Write(tree_out);
printf("[VocabBuildDB] Writing database ...\n");
tree.Write(db_out);

// char filename[256];
// sprintf(filename, "vectors_%03d.txt", start_id);
Expand Down
20 changes: 10 additions & 10 deletions VocabMatch/VocabMatch.cpp
Expand Up @@ -155,13 +155,13 @@ int main(int argc, char **argv)
const int dim = 128;

if (argc != 6 && argc != 7 && argc != 8) {
printf("Usage: %s <tree.in> <db.in> <query.in> <num_nbrs> "
printf("Usage: %s <tree.in> <list.in> <query.in> <num_nbrs> "
"<matches.out> [distance_type:1] [normalize:1]\n", argv[0]);
return 1;
}
char *tree_in = argv[1];
char *db_in = argv[2];

char *db_in = argv[1];
char *list_in = argv[2];
char *query_in = argv[3];
int num_nbrs = atoi(argv[4]);
char *matches_out = argv[5];
Expand All @@ -179,7 +179,7 @@ int main(int argc, char **argv)
if (argc >= 8)
normalize = (atoi(argv[7]) != 0);

printf("[VocabMatch] Using tree %s\n", tree_in);
printf("[VocabMatch] Using database %s\n", db_in);

switch (distance_type) {
case DistanceDot:
Expand All @@ -194,15 +194,15 @@ int main(int argc, char **argv)
}

/* Read the tree */
printf("[VocabMatch] Reading tree...\n");
printf("[VocabMatch] Reading database...\n");
fflush(stdout);

clock_t start = clock();
VocabTree tree;
tree.Read(tree_in);
tree.Read(db_in);

clock_t end = clock();
printf("[VocabMatch] Read tree in %0.3fs\n",
printf("[VocabMatch] Read database in %0.3fs\n",
(double) (end - start) / CLOCKS_PER_SEC);

#if 1
Expand All @@ -213,9 +213,9 @@ int main(int argc, char **argv)
tree.SetInteriorNodeWeight(0, 0.0);

/* Read the database keyfiles */
FILE *f = fopen(db_in, "r");
FILE *f = fopen(list_in, "r");
if (f == NULL) {
printf("Could not open file: %s\n", db_in);
printf("Could not open file: %s\n", list_in);
return 1;
}

Expand Down

0 comments on commit 87209ba

Please sign in to comment.