From 85132716d335a05bb35f8bb48c65d1c6dce934d3 Mon Sep 17 00:00:00 2001 From: "jan.reininghaus" Date: Mon, 24 Jun 2013 09:48:27 +0000 Subject: new block_spectral_sequence_reduction git-svn-id: https://phat.googlecode.com/svn/trunk@134 8e3bb3c2-eed4-f18f-5264-0b6c94e6926d --- src/benchmark.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/benchmark.cpp') diff --git a/src/benchmark.cpp b/src/benchmark.cpp index 59b5f32..ca2497c 100644 --- a/src/benchmark.cpp +++ b/src/benchmark.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include @@ -37,7 +38,7 @@ enum Representation_type {VECTOR_VECTOR, VECTOR_SET, SPARSE_PIVOT_COLUMN, FULL_PIVOT_COLUMN, BIT_TREE_PIVOT_COLUMN, VECTOR_LIST}; -enum Algorithm_type {STANDARD, TWIST, ROW, CHUNK, CHUNK_SEQUENTIAL}; +enum Algorithm_type {STANDARD, TWIST, ROW, CHUNK, CHUNK_SEQUENTIAL, BLOCK_SPECTRAL_SEQUENCE}; enum Ansatz_type {PRIMAL, DUAL}; void print_help() { @@ -51,7 +52,7 @@ void print_help() { std::cerr << "--dualize -- use only dualization approach" << std::endl; std::cerr << "--primal -- use only primal approach" << std::endl; std::cerr << "--vector_vector, --vector_set, --vector_list, --full_pivot_column, --sparse_pivot_column, --bit_tree_pivot_column -- use only a subset of representation data structures for boundary matrices" << std::endl; - std::cerr << "--standard, --twist, --chunk, --chunk_sequential, --row -- use only a subset of reduction algorithms" << std::endl; + std::cerr << "--standard, --twist, --chunk, --chunk_sequential, --block_spectral_sequence, --row -- use only a subset of reduction algorithms" << std::endl; } void print_help_and_exit() { @@ -80,6 +81,7 @@ void parse_command_line( int argc, char** argv, bool& use_binary, std::vector< R else if( argument == "--twist" ) algorithms.push_back( TWIST ); else if( argument == "--row" ) algorithms.push_back( ROW ); else if( argument == "--chunk_sequential" ) algorithms.push_back( CHUNK_SEQUENTIAL ); + else if( argument == "--block_spectral_sequence" ) algorithms.push_back( BLOCK_SPECTRAL_SEQUENCE ); else if( argument == "--chunk" ) algorithms.push_back( CHUNK ); else if( argument == "--primal" ) ansaetze.push_back( PRIMAL ); else if( argument == "--dual" ) ansaetze.push_back( DUAL ); @@ -153,6 +155,7 @@ void benchmark( std::string input_filename, bool use_binary, Ansatz_type ansatz case TWIST: std::cout << " twist,"; benchmark< phat::Representation, phat::twist_reduction >( input_filename, use_binary, ansatz ); break; \ case ROW: std::cout << " row,"; benchmark< phat::Representation, phat::row_reduction >( input_filename, use_binary, ansatz ); break; \ case CHUNK: std::cout << " chunk,"; benchmark< phat::Representation, phat::chunk_reduction >( input_filename, use_binary, ansatz ); break; \ + case BLOCK_SPECTRAL_SEQUENCE: std::cout << " block spectral sequence,"; benchmark< phat::Representation, phat::block_spectral_sequence_reduction >( input_filename, use_binary, ansatz ); break; \ case CHUNK_SEQUENTIAL: std::cout << " chunk_sequential,"; \ int num_threads = omp_get_max_threads(); \ omp_set_num_threads( 1 ); \ -- cgit v1.2.3