fixed issues with loading features and directories

PRBonn · Nov 24, 2017 · e9b77f3 · e9b77f3
1 parent fe1fc48
commit e9b77f3
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/apps/cost_matrix_based_matching/cost_matrix_based_matching_lsh.cpp b/apps/cost_matrix_based_matching/cost_matrix_based_matching_lsh.cpp
@@ -52,7 +52,7 @@ std::vector<iBinarizableFeature::Ptr> loadFeatures(
         iBinarizableFeature::Ptr(new CnnFeature);
     // [VGG] Uncomment this to use vgg features
     // iBinarizableFeature::Ptr(new VggFeature);
-    featurePtr->loadFromFile(path2folder + featureNames[i]);
+    featurePtr->loadFromFile(featureNames[i]);
     featurePtrs.push_back(featurePtr);
     fprintf(stderr, ".");
   }

diff --git a/apps/create_cost_matrix/create_cost_matrix.cpp b/apps/create_cost_matrix/create_cost_matrix.cpp
@@ -44,7 +44,7 @@ FeatureBuffer loadFeatures(const std::string &path2folder,
   printf("Loading features\n");
   for (size_t i = 0; i < featureNames.size(); ++i) {
     iFeature::Ptr featurePtr = factory.createFeature();
-    featurePtr->loadFromFile(path2folder + featureNames[i]);
+    featurePtr->loadFromFile(featureNames[i]);
     buffer.addFeature(i, featurePtr);
     fprintf(stderr, ".");
   }

diff --git a/apps/estimate_similar_places/estimate_similar_places.cpp b/apps/estimate_similar_places/estimate_similar_places.cpp
@@ -45,7 +45,7 @@ std::vector<iBinarizableFeature::Ptr> readFeatures(
     iBinarizableFeature::Ptr featurePtr =
         // iBinarizableFeature::Ptr(new CnnFeatureMean);
         iBinarizableFeature::Ptr(new VggFeatureMean);
-    featurePtr->loadFromFile(path2folder + featureNames[i]);
+    featurePtr->loadFromFile(featureNames[i]);
     v.push_back(featurePtr);
     std::cerr << ".";
   }

diff --git a/apps/feature_based_matching/feature_based_matching_dh.cpp b/apps/feature_based_matching/feature_based_matching_dh.cpp
@@ -88,8 +88,8 @@ int main(int argc, char *argv[]) {
       QApplication::translate("toplevel", "Olga's awesome viewer"));
 
   MatchViewer *matchViewer = new MatchViewer();
-  matchViewer->setQuImageDirectory(parser.path2quImg);
-  matchViewer->setRefImageDirectory(parser.path2refImg);
+  matchViewer->setQueryImages(parser.path2quImg);
+  matchViewer->setRefImages(parser.path2refImg);
   matchViewer->setImageExtension(parser.imgExt);
   matchViewer->setDatabase(onlineDatabasePtr);
 

diff --git a/apps/feature_based_matching/feature_based_matching_lsh.cpp b/apps/feature_based_matching/feature_based_matching_lsh.cpp
@@ -57,7 +57,7 @@ std::vector<iBinarizableFeature::Ptr> loadFeatures(
         iBinarizableFeature::Ptr(new CnnFeatureMean);
     // [VGG] Uncomment this to use vgg features
     // iBinarizableFeature::Ptr(new VggFeatureMean);
-    featurePtr->loadFromFile(path2folder + featureNames[i]);
+    featurePtr->loadFromFile(featureNames[i]);
     featurePtrs.push_back(featurePtr);
     fprintf(stderr, ".");
   }
@@ -115,8 +115,8 @@ int main(int argc, char *argv[]) {
       QApplication::translate("toplevel", "Olga's awesome viewer"));
 
   MatchViewer *matchViewer = new MatchViewer();
-  matchViewer->setQuImageDirectory(parser.path2quImg);
-  matchViewer->setRefImageDirectory(parser.path2refImg);
+  matchViewer->setQueryImages(parser.path2quImg);
+  matchViewer->setRefImages(parser.path2refImg);
   matchViewer->setImageExtension(parser.imgExt);
   matchViewer->setDatabase(onlineDatabasePtr);
 

diff --git a/apps/hash_features/hash_features.cpp b/apps/hash_features/hash_features.cpp
@@ -40,7 +40,7 @@ void hashDimensions(const std::string &path2folder,
     iBinarizableFeature::Ptr featurePtr =
         iBinarizableFeature::Ptr(new CnnFeature);
         // iBinarizableFeature::Ptr(new VggFeature);
-    featurePtr->loadFromFile(path2folder + featureNames[i]);
+    featurePtr->loadFromFile(featureNames[i]);
     featurePtrs.push_back(featurePtr);
     fprintf(stderr, ".");
   }

diff --git a/test/test_dimension_hashing.cpp b/test/test_dimension_hashing.cpp
@@ -94,7 +94,7 @@ TEST(DimensionHashing, hashFeature) {
 
 //   for (size_t i = 0; i < featureNames.size(); ++i) {
 //     BinaryFeature::Ptr featurePtr = BinaryFeature::Ptr(new BinaryFeature);
-//     featurePtr->loadFromFile(path2folder + featureNames[i]);
+//     featurePtr->loadFromFile(featureNames[i]);
 //     featurePtr->binarize();
 //     featurePtrs.push_back(featurePtr);
 //     fprintf(stderr, ".");