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/phat.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/phat.cpp') diff --git a/src/phat.cpp b/src/phat.cpp index c19aea8..1cc5ebb 100644 --- a/src/phat.cpp +++ b/src/phat.cpp @@ -29,11 +29,12 @@ #include #include #include +#include #include 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 }; void print_help() { std::cerr << "Usage: " << "phat " << "[options] input_filename output_filename" << std::endl; @@ -46,7 +47,7 @@ void print_help() { std::cerr << "--verbose -- verbose output" << std::endl; std::cerr << "--dualize -- use dualization approach" << std::endl; std::cerr << "--vector_vector, --vector_set, --vector_list, --full_pivot_column, --sparse_pivot_column, --bit_tree_pivot_column -- selects a representation data structure for boundary matrices (default is '--bit_tree_pivot_column')" << std::endl; - std::cerr << "--standard, --twist, --chunk, --chunk_sequential, --row -- selects a reduction algorithm (default is '--twist')" << std::endl; + std::cerr << "--standard, --twist, --chunk, --chunk_sequential, --block_spectral_sequence, --row -- selects a reduction algorithm (default is '--twist')" << std::endl; } void print_help_and_exit() { @@ -79,6 +80,7 @@ void parse_command_line( int argc, char** argv, bool& use_binary, Representation else if( option == "--row" ) algorithm = ROW; else if( option == "--chunk" ) algorithm = CHUNK; else if( option == "--chunk_sequential" ) algorithm = CHUNK_SEQUENTIAL; + else if( option == "--block_spectral_sequence" ) algorithm = BLOCK_SPECTRAL_SEQUENCE; else if( option == "--verbose" ) verbose = true; else if( option == "--help" ) print_help_and_exit(); else print_help_and_exit(); @@ -150,6 +152,7 @@ void compute_pairing( std::string input_filename, std::string output_filename, b case STANDARD: compute_pairing< phat::Representation, phat::standard_reduction> ( input_filename, output_filename, use_binary, verbose, dualize ); break; \ case TWIST: compute_pairing< phat::Representation, phat::twist_reduction> ( input_filename, output_filename, use_binary, verbose, dualize ); break; \ case ROW: compute_pairing< phat::Representation, phat::row_reduction >( input_filename, output_filename, use_binary, verbose, dualize ); break; \ + case BLOCK_SPECTRAL_SEQUENCE: compute_pairing< phat::Representation, phat::block_spectral_sequence_reduction >( input_filename, output_filename, use_binary, verbose, dualize ); break; \ case CHUNK: compute_pairing< phat::Representation, phat::chunk_reduction >( input_filename, output_filename, use_binary, verbose, dualize ); break; \ case CHUNK_SEQUENTIAL: int num_threads = omp_get_max_threads(); \ omp_set_num_threads( 1 ); \ -- cgit v1.2.3