Merge commit '28e34af047c621cfabe31a39b408c85f01363621'

* commit '28e34af047c621cfabe31a39b408c85f01363621':
  Corrected the code to include Gabriel test (not tested yet)
  added std:: to setiosflags to phat and benchmark so it compiles

1 files changed, 4 insertions, 4 deletions

diff --git a/src/phat.cpp b/src/phat.cpp
index b099b59..3770cf3 100644
--- a/src/phat.cpp
+++ b/src/phat.cpp
@@ -109,7 +109,7 @@ void compute_pairing( std::string input_filename, std::string output_filename, b
     }

     double read_time = omp_get_wtime() - read_timer;

     double read_time_rounded = floor( read_time * 10.0 + 0.5 ) / 10.0;

-    LOG( "Reading input file took " << setiosflags( std::ios::fixed ) << setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << read_time_rounded <<"s" )

+    LOG( "Reading input file took " << std::setiosflags( std::ios::fixed ) << std::setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << read_time_rounded <<"s" )

 

     if( !read_successful ) {

         std::cerr << "Error opening file " << input_filename << std::endl;

@@ -124,7 +124,7 @@ void compute_pairing( std::string input_filename, std::string output_filename, b
         phat::dualize ( matrix );

         double dualize_time = omp_get_wtime() - dualize_timer;

         double dualize_time_rounded = floor( dualize_time * 10.0 + 0.5 ) / 10.0;

-        LOG( "Dualizing took " << setiosflags( std::ios::fixed ) << setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << dualize_time_rounded <<"s" )

+        LOG( "Dualizing took " << std::setiosflags( std::ios::fixed ) << std::setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << dualize_time_rounded <<"s" )

     }

         

     double pairs_timer = omp_get_wtime();

@@ -133,7 +133,7 @@ void compute_pairing( std::string input_filename, std::string output_filename, b
     phat::compute_persistence_pairs < Algorithm > ( pairs, matrix );

     double pairs_time = omp_get_wtime() - pairs_timer;

     double pairs_time_rounded = floor( pairs_time * 10.0 + 0.5 ) / 10.0;

-    LOG( "Computing persistence pairs took " << setiosflags( std::ios::fixed ) << setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << pairs_time_rounded <<"s" )

+    LOG( "Computing persistence pairs took " << std::setiosflags( std::ios::fixed ) << std::setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << pairs_time_rounded <<"s" )

     

     if( dualize ) dualize_persistence_pairs( pairs, num_cols );

     

@@ -148,7 +148,7 @@ void compute_pairing( std::string input_filename, std::string output_filename, b
     }

     double write_time = omp_get_wtime() - write_timer;

     double write_time_rounded = floor( write_time * 10.0 + 0.5 ) / 10.0;

-    LOG( "Writing output file took " << setiosflags( std::ios::fixed ) << setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << write_time_rounded <<"s" )

+    LOG( "Writing output file took " << std::setiosflags( std::ios::fixed ) << std::setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << write_time_rounded <<"s" )

 }

 

 #define COMPUTE_PAIRING(Representation) \