summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorprimoz.skraba@gmail.com <primoz.skraba@gmail.com@8e3bb3c2-eed4-f18f-5264-0b6c94e6926d>2015-02-24 20:13:48 +0000
committerprimoz.skraba@gmail.com <primoz.skraba@gmail.com@8e3bb3c2-eed4-f18f-5264-0b6c94e6926d>2015-02-24 20:13:48 +0000
commit93069289732bcaa78fbc0e4a735e11b117b5d866 (patch)
treef8de46a60b270d5a33955a6ae7293776d2bbedcb
parentc95e71eef54cd36ba206e497d564b96682b2e926 (diff)
added std:: to setiosflags to phat and benchmark so it compiles
git-svn-id: https://phat.googlecode.com/svn/trunk@183 8e3bb3c2-eed4-f18f-5264-0b6c94e6926d
-rw-r--r--src/benchmark.cpp6
-rw-r--r--src/phat.cpp8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index acfddc1..24b5cfd 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -147,14 +147,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>
@@ -185,7 +185,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) \
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) \