From 2fef8017dd279bae5326068b3c5aa763a4788d81 Mon Sep 17 00:00:00 2001 From: "jan.reininghaus" Date: Thu, 21 Mar 2013 11:52:45 +0000 Subject: replaced tabs with spaces git-svn-id: https://phat.googlecode.com/svn/trunk@9 8e3bb3c2-eed4-f18f-5264-0b6c94e6926d --- include/phat/algorithms/chunk_reduction.h | 4 ++-- include/phat/helpers/thread_local_storage.h | 20 ++++++++++---------- src/phat.cpp | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/include/phat/algorithms/chunk_reduction.h b/include/phat/algorithms/chunk_reduction.h index 91976e6..44454bb 100644 --- a/include/phat/algorithms/chunk_reduction.h +++ b/include/phat/algorithms/chunk_reduction.h @@ -163,8 +163,8 @@ namespace phat { thread_local_storage< std::vector< index > > cur_col_values_buffer; #pragma omp parallel for schedule( guided, 1 ) for( index idx = 0; idx < (index)global_columns.size(); idx++ ) { - std::vector< std::pair < index, index > >& stack = stack_buffer(); - std::vector< index >& cur_col_values = cur_col_values_buffer(); + std::vector< std::pair < index, index > >& stack = stack_buffer(); + std::vector< index >& cur_col_values = cur_col_values_buffer(); bool pop_next = false; index start_col = global_columns[ idx ]; stack.push_back( std::pair< index, index >( start_col, -1 ) ); diff --git a/include/phat/helpers/thread_local_storage.h b/include/phat/helpers/thread_local_storage.h index ce3c1ed..d0b5332 100644 --- a/include/phat/helpers/thread_local_storage.h +++ b/include/phat/helpers/thread_local_storage.h @@ -31,21 +31,21 @@ public: thread_local_storage() : per_thread_storage( omp_get_max_threads() * PHAT_TLS_SPACING_FACTOR ) {}; - T& operator()() { - return per_thread_storage[ omp_get_thread_num() * PHAT_TLS_SPACING_FACTOR ]; - } + T& operator()() { + return per_thread_storage[ omp_get_thread_num() * PHAT_TLS_SPACING_FACTOR ]; + } const T& operator()() const { - return per_thread_storage[ omp_get_thread_num() * PHAT_TLS_SPACING_FACTOR ]; - } + return per_thread_storage[ omp_get_thread_num() * PHAT_TLS_SPACING_FACTOR ]; + } - T& operator[]( int tid ) { - return per_thread_storage[ tid * PHAT_TLS_SPACING_FACTOR ]; - } + T& operator[]( int tid ) { + return per_thread_storage[ tid * PHAT_TLS_SPACING_FACTOR ]; + } const T& operator[]( int tid ) const { - return per_thread_storage[ tid * PHAT_TLS_SPACING_FACTOR ]; - } + return per_thread_storage[ tid * PHAT_TLS_SPACING_FACTOR ]; + } protected: std::vector< T > per_thread_storage; diff --git a/src/phat.cpp b/src/phat.cpp index 895d52d..a98827c 100644 --- a/src/phat.cpp +++ b/src/phat.cpp @@ -84,8 +84,8 @@ void parse_command_line( int argc, char** argv, bool& use_binary, Representation template void generic_compute_pairing( std::string input_filename, std::string output_filename, - bool use_binary, - bool verbose, + bool use_binary, + bool verbose, bool dualize ) { phat::boundary_matrix< Representation > matrix; @@ -93,7 +93,7 @@ void generic_compute_pairing( std::string input_filename, double read_timer = omp_get_wtime(); if( use_binary ) { - LOG( "Reading input file " << input_filename << " in binary mode" ) + LOG( "Reading input file " << input_filename << " in binary mode" ) read_successful = matrix.load_binary( input_filename ); } else { LOG( "Reading input file " << input_filename << " in ascii mode" ) -- cgit v1.2.3