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, 3 insertions, 3 deletions

diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 0f2a38e..b552d33 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -148,14 +148,14 @@ void benchmark( std::string input_filename, bool use_binary, Ansatz_type ansatz
         dualize( matrix );

         double dualization_time = omp_get_wtime() - dualization_timer;

         double dualization_time_rounded = floor( dualization_time * 10.0 + 0.5 ) / 10.0;

-        std::cout << " Dualization time: " << setiosflags( std::ios::fixed ) << setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << dualization_time_rounded <<"s,";

+        std::cout << " Dualization time: " << std::setiosflags( std::ios::fixed ) << std::setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << dualization_time_rounded <<"s,";

         reduction_timer = omp_get_wtime();

         reduction_algorithm( matrix );

     }

 

     double running_time = omp_get_wtime() - reduction_timer;

     double running_time_rounded = floor( running_time * 10.0 + 0.5 ) / 10.0;

-    std::cout << " Reduction time: " << setiosflags( std::ios::fixed ) << setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << running_time_rounded <<"s" << std::endl;

+    std::cout << " Reduction time: " << std::setiosflags( std::ios::fixed ) << std::setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << running_time_rounded <<"s" << std::endl;

 }

 

 template<typename Representation, typename Algorithm>

@@ -186,7 +186,7 @@ void benchmark_latex( std::string input_filename, bool use_binary, Ansatz_type a
     //double running_time = omp_get_wtime() - reduction_timer + dualization_time;

     double running_time = omp_get_wtime( ) - reduction_timer; 

     double running_time_rounded = floor( running_time * 10.0 + 0.5 ) / 10.0;

-    std::cout << " && " << setiosflags( std::ios::fixed ) << setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << std::setw( 12 ) << running_time_rounded << std::setw( 1 );

+    std::cout << " && " << std::setiosflags( std::ios::fixed ) << std::setiosflags( std::ios::showpoint ) << std::setprecision( 1 ) << std::setw( 12 ) << running_time_rounded << std::setw( 1 );

 }

 

 #define COMPUTE(Representation) \