Solved bug in util

A-Eye-Technologies · Oct 20, 2016 · 0cda723 · 0cda723
1 parent 76b6aa4
commit 0cda723
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/src/BowVector.cpp b/src/BowVector.cpp
@@ -150,6 +150,13 @@ for(int i=0;i<s;i++){
 
 }
 
+uint64_t BowVector::getSignature()const{
+uint64_t sig=0;
+for(auto ww:*this) sig+=ww.first+1e6*ww.second;
+return sig;
+}
+
+
 // --------------------------------------------------------------------------
 
 } // namespace DBoW3

diff --git a/src/BowVector.h b/src/BowVector.h
@@ -102,6 +102,8 @@ class DBOW_API BowVector:
 	 */
 	void saveM(const std::string &filename, size_t W) const;
 
+    //returns a unique number from the configuration
+    uint64_t getSignature()const;
     //serialization
     void toStream(std::ostream &str)const;
     void fromStream(std::istream &str);

diff --git a/utils/demo_general.cpp b/utils/demo_general.cpp
@@ -180,21 +180,17 @@ int main(int argc,char **argv)
 
     try{
         CmdLineParser cml(argc,argv);
-        if (cml["-h"] || argc==1){
-            cerr<<"Usage:  descriptor_name action output image0 image1 ... \n\t descriptors:brisk,surf,orb(default),akaze(only if using opencv 3)"<<endl;
-            cerr<<"actions:\n\t0 : compute and save features\n\t1:create voc from features"<<endl;
-            return -1;
+        if (cml["-h"] || argc<=2){
+            cerr<<"Usage:  descriptor_name     image0 image1 ... \n\t descriptors:brisk,surf,orb ,akaze(only if using opencv 3)"<<endl;
+             return -1;
         }
 
         string descriptor=argv[1];
-        string out_features=argv[2];
-        string out_voc=argv[3];
 
-        auto images=readImagePaths(argc,argv,4);
+        auto images=readImagePaths(argc,argv,2);
         vector< cv::Mat   >   features= loadFeatures(images,descriptor);
         testVocCreation(features);
 
-        wait();
 
         testDatabase(features);