summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjan.reininghaus <jan.reininghaus@8e3bb3c2-eed4-f18f-5264-0b6c94e6926d>2013-12-17 10:32:49 +0000
committerjan.reininghaus <jan.reininghaus@8e3bb3c2-eed4-f18f-5264-0b6c94e6926d>2013-12-17 10:32:49 +0000
commit38ead7f8efac523d6fe0d78bb31474063d8ab5b2 (patch)
treea93b33ec11fcfbe6584afef79777fa324024a879 /src
parentd7d252f4ab9cfea4001b29f25982fd045524054c (diff)
rename block_spectral_sequence_reduction to spectral_sequence_reduction
git-svn-id: https://phat.googlecode.com/svn/trunk@149 8e3bb3c2-eed4-f18f-5264-0b6c94e6926d
Diffstat (limited to 'src')
-rw-r--r--src/benchmark.cpp8
-rw-r--r--src/phat.cpp8
-rw-r--r--src/self_test.cpp8
3 files changed, 12 insertions, 12 deletions
diff --git a/src/benchmark.cpp b/src/benchmark.cpp
index 6a75bfe..94ace84 100644
--- a/src/benchmark.cpp
+++ b/src/benchmark.cpp
@@ -39,7 +39,7 @@
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 Algorithm_type {STANDARD, TWIST, ROW, CHUNK, CHUNK_SEQUENTIAL, SPECTRAL_SEQUENCE};
enum Ansatz_type {PRIMAL, DUAL};
void print_help() {
@@ -53,7 +53,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, --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;
+ std::cerr << "--standard, --twist, --chunk, --chunk_sequential, --spectral_sequence, --row -- use only a subset of reduction algorithms" << std::endl;
}
void print_help_and_exit() {
@@ -83,7 +83,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 == "--spectral_sequence" ) algorithms.push_back( 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 );
@@ -157,7 +157,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 SPECTRAL_SEQUENCE: std::cout << " spectral sequence,"; benchmark< phat::Representation, phat::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 ); \
diff --git a/src/phat.cpp b/src/phat.cpp
index 7f994db..a3b8295 100644
--- a/src/phat.cpp
+++ b/src/phat.cpp
@@ -35,7 +35,7 @@
#include <phat/helpers/dualize.h>
enum Representation_type {VECTOR_VECTOR, VECTOR_SET, SPARSE_PIVOT_COLUMN, FULL_PIVOT_COLUMN, BIT_TREE_PIVOT_COLUMN, VECTOR_LIST, HEAP_PIVOT_COLUMN};
-enum Algorithm_type {STANDARD, TWIST, ROW, CHUNK, CHUNK_SEQUENTIAL, BLOCK_SPECTRAL_SEQUENCE };
+enum Algorithm_type {STANDARD, TWIST, ROW, CHUNK, CHUNK_SEQUENTIAL, SPECTRAL_SEQUENCE };
void print_help() {
std::cerr << "Usage: " << "phat " << "[options] input_filename output_filename" << std::endl;
@@ -48,7 +48,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, --heap_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, --block_spectral_sequence, --row -- selects a reduction algorithm (default is '--twist')" << std::endl;
+ std::cerr << "--standard, --twist, --chunk, --chunk_sequential, --spectral_sequence, --row -- selects a reduction algorithm (default is '--twist')" << std::endl;
}
void print_help_and_exit() {
@@ -82,7 +82,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 == "--spectral_sequence" ) algorithm = SPECTRAL_SEQUENCE;
else if( option == "--verbose" ) verbose = true;
else if( option == "--help" ) print_help_and_exit();
else print_help_and_exit();
@@ -154,7 +154,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 SPECTRAL_SEQUENCE: compute_pairing< phat::Representation, phat::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 ); \
diff --git a/src/self_test.cpp b/src/self_test.cpp
index 21bb3bc..b310eb5 100644
--- a/src/self_test.cpp
+++ b/src/self_test.cpp
@@ -144,10 +144,10 @@ int main( int argc, char** argv )
phat::boundary_matrix< BitTree > row_boundary_matrix = boundary_matrix;
phat::compute_persistence_pairs< phat::row_reduction >( row_pairs, row_boundary_matrix );
- std::cout << "Running Block spectral sequence - BitTree ..." << std::endl;
+ std::cout << "Running Spectral sequence - BitTree ..." << std::endl;
phat::persistence_pairs ss_pairs;
phat::boundary_matrix< BitTree > ss_boundary_matrix = boundary_matrix;
- phat::compute_persistence_pairs< phat::block_spectral_sequence_reduction >( ss_pairs, ss_boundary_matrix );
+ phat::compute_persistence_pairs< phat::spectral_sequence_reduction >( ss_pairs, ss_boundary_matrix );
if( twist_pairs != std_pairs ) {
std::cerr << "Error: twist and standard differ!" << std::endl;
@@ -162,11 +162,11 @@ int main( int argc, char** argv )
error = true;
}
if( row_pairs != ss_pairs ) {
- std::cerr << "Error: row and block spectral sequence differ!" << std::endl;
+ std::cerr << "Error: row and spectral sequence differ!" << std::endl;
error = true;
}
if( ss_pairs != twist_pairs ) {
- std::cerr << "Error: block spectral sequence and twist differ!" << std::endl;
+ std::cerr << "Error: spectral sequence and twist differ!" << std::endl;
error = true;
}