From 6723f7687a27ac4e48a5d46bdac9cd4aa2478830 Mon Sep 17 00:00:00 2001 From: "jan.reininghaus" Date: Tue, 17 Dec 2013 10:17:07 +0000 Subject: new representation type heap_pivot_column git-svn-id: https://phat.googlecode.com/svn/trunk@147 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 ca2497c..6a75bfe 100644 --- a/src/benchmark.cpp +++ b/src/benchmark.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -37,7 +38,7 @@ #include -enum Representation_type {VECTOR_VECTOR, VECTOR_SET, SPARSE_PIVOT_COLUMN, FULL_PIVOT_COLUMN, BIT_TREE_PIVOT_COLUMN, VECTOR_LIST}; +enum Representation_type {VECTOR_VECTOR, VECTOR_SET, SPARSE_PIVOT_COLUMN, HEAP_PIVOT_COLUMN, FULL_PIVOT_COLUMN, BIT_TREE_PIVOT_COLUMN, VECTOR_LIST}; enum Algorithm_type {STANDARD, TWIST, ROW, CHUNK, CHUNK_SEQUENTIAL, BLOCK_SPECTRAL_SEQUENCE}; enum Ansatz_type {PRIMAL, DUAL}; @@ -51,7 +52,7 @@ void print_help() { std::cerr << "--help -- prints this screen" << std::endl; 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 << "--vector_vector, --vector_set, --vector_list, --full_pivot_column, --sparse_pivot_column, --heap_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, --block_spectral_sequence, --row -- use only a subset of reduction algorithms" << std::endl; } @@ -77,6 +78,7 @@ void parse_command_line( int argc, char** argv, bool& use_binary, std::vector< R else if( argument == "--full_pivot_column" ) representations.push_back( FULL_PIVOT_COLUMN ); else if( argument == "--bit_tree_pivot_column" ) representations.push_back( BIT_TREE_PIVOT_COLUMN ); else if( argument == "--sparse_pivot_column" ) representations.push_back( SPARSE_PIVOT_COLUMN ); + else if( argument == "--heap_pivot_column" ) representations.push_back( HEAP_PIVOT_COLUMN ); else if( argument == "--standard" ) algorithms.push_back( STANDARD ); else if( argument == "--twist" ) algorithms.push_back( TWIST ); else if( argument == "--row" ) algorithms.push_back( ROW ); @@ -191,6 +193,7 @@ int main( int argc, char** argv ) case FULL_PIVOT_COLUMN: COMPUTE(full_pivot_column) break; case BIT_TREE_PIVOT_COLUMN: COMPUTE(bit_tree_pivot_column) break; case SPARSE_PIVOT_COLUMN: COMPUTE(sparse_pivot_column) break; + case HEAP_PIVOT_COLUMN: COMPUTE(heap_pivot_column) break; } } } -- cgit v1.2.3