[test] new option dv, fix codacy bug

Author: Carsten Griwodz

testScripts/CompareDescriptors/compareSiftFiles.cpp

@@ -17,6 +17,7 @@ void usage( char* name );
 
 const char* outfile_name = 0;
 const char* descfile_name = 0;
+bool        descfile_verbose = false;
 
 int main( int argc, char* argv[] )
 {
@@ -51,6 +52,13 @@ int main( int argc, char* argv[] )
                 argc -= 2;
                 argv += 2;
             }
+            else if( !strcmp( argv[1], "-dv" ) )
+            {
+                descfile_name = argv[2];
+                argc -= 2;
+                argv += 2;
+                descfile_verbose = true;
+            }
             else
             {
                 break;
@@ -111,7 +119,9 @@ int main( int argc, char* argv[] )
 
     for( auto l : l_one )
     {
-        l.compareBestMatch( *outfile, descfile, l_two, desc_stats, briefinfo );
+        ostream* print_dists = descfile_verbose ? descfile : 0;
+
+        l.compareBestMatch( *outfile, print_dists, l_two, desc_stats, briefinfo );
         ct++;
         if( float(ct * 100) / len >= float(nextpercent) )
         {
@@ -120,21 +130,24 @@ int main( int argc, char* argv[] )
         }
     }
 
-    int sz = l_one.size();
-    (*descfile) << "========== Summary Stats ==========" << endl
-            << "Average values:" << endl
-            << setprecision(3);
-    for( int i=0; i<128; i++ )
+    if( descfile )
     {
-        if( i%32==0  ) (*descfile) << "X=0 | ";
-        if( i%32==8  ) (*descfile) << "X=1 |  ";
-        if( i%32==16 ) (*descfile) << "X=2 |   ";
-        if( i%32==24 ) (*descfile) << "X=3 |    ";
-        desc_stats[i] /= sz;
-        (*descfile) << setw(8) << desc_stats[i] << " ";
-        if( i%8==7 ) (*descfile) << endl;
+        int sz = l_one.size();
+        (*descfile) << "========== Summary Stats ==========" << endl
+                    << "Average values:" << endl
+                    << setprecision(3);
+        for( int i=0; i<128; i++ )
+        {
+            if( i%32==0  ) (*descfile) << "X=0 | ";
+            if( i%32==8  ) (*descfile) << "X=1 |  ";
+            if( i%32==16 ) (*descfile) << "X=2 |   ";
+            if( i%32==24 ) (*descfile) << "X=3 |    ";
+            desc_stats[i] /= sz;
+            (*descfile) << setw(8) << desc_stats[i] << " ";
+            if( i%8==7 ) (*descfile) << endl;
+        }
+        (*descfile) << endl;
     }
-    (*descfile) << endl;
 
     if( outfile_name != 0 )
     {
@@ -153,7 +166,8 @@ void usage( char* name )
          << "       -v : verbose, longer output" << endl
          << "       -l1 : use L1 for distance computation instead of L2" << endl
          << "       -o <file> : print essential diff info to <file> (default is cout)" << endl
-         << "       -d <file> : print descriptor distance per cell to <file>" << endl
+         << "       -d[v] <file> : print descriptor distance per cell to <file>" << endl
+         << "                      d prints a summary, v prints every comparison" << endl
          << endl;
     exit( 0 );
 }

testScripts/CompareDescriptors/csf_feat.cpp

@@ -127,10 +127,10 @@ void feat_t::compareBestMatch( ostream& ostr, ostream* dstr, const vector<feat_t
                     for( int i=0; i<128; i++, left++, right++ )
                     {
                         float diff = *left - *right;
-                        // (*dstr) << diff << " ";
+                        (*dstr) << diff << " ";
                         desc_stats[i] += diff;
                     }
-                    // (*dstr) << endl;
+                    (*dstr) << endl;
                 }
             }
             else if( *it > *m )