From e9800d103fcdd19f0417e89781761f7f85d8ec9b Mon Sep 17 00:00:00 2001 From: Michael Kerber Date: Fri, 18 May 2018 10:52:51 +0200 Subject: Column types are separated, and the matrix representation is more general in its container type --- include/phat/boundary_matrix.h | 74 +++++++++++++++++++++++++++++------------- 1 file changed, 51 insertions(+), 23 deletions(-) (limited to 'include/phat/boundary_matrix.h') diff --git a/include/phat/boundary_matrix.h b/include/phat/boundary_matrix.h index f864dee..295cfa5 100644 --- a/include/phat/boundary_matrix.h +++ b/include/phat/boundary_matrix.h @@ -19,12 +19,14 @@ #pragma once #include -#include +#include -// interface class for the main data structure -- implementations of the interface can be found in ./representations namespace phat { - template< class Representation = bit_tree_pivot_column > - class boundary_matrix + +// interface class for the main data structure -- implementations of the interface can be found in ./representations + + template< class Representation = bit_tree_pivot_column > + class boundary_matrix { protected: @@ -45,28 +47,39 @@ namespace phat { void set_dim( index idx, dimension dim ) { rep._set_dim( idx, dim ); } // replaces content of @col with boundary of given index - void get_col( index idx, column& col ) const { col.clear(); rep._get_col( idx, col ); } + void get_col( index idx, column& col ) const { + rep._get_col( idx, col ); + } // set column @idx to the values contained in @col - void set_col( index idx, const column& col ) { rep._set_col( idx, col ); } + void set_col( index idx, const column& col ) { + rep._set_col( idx, col ); } // true iff boundary of given column is empty - bool is_empty( index idx ) const { return rep._is_empty( idx ); } + bool is_empty( index idx ) const { + return rep._is_empty(idx); + } // largest index of given column (new name for lowestOne()) -- NOT thread-safe - index get_max_index( index idx ) const { return rep._get_max_index( idx ); } + index get_max_index( index idx ) const { + return rep._get_max_index(idx); } // removes maximal index from given column - void remove_max( index idx ) { rep._remove_max( idx ); } + void remove_max( index idx ) { + return rep._remove_max( idx ); + } // adds column @source to column @target' - void add_to( index source, index target ) { rep._add_to( source, target ); } + void add_to( index source, index target ) { + rep._add_to( source, target ); } // clears given column - void clear( index idx ) { rep._clear( idx ); } + void clear( index idx ) { + rep._clear(idx); } // finalizes given column - void finalize( index idx ) { rep._finalize( idx ); } + void finalize( index idx ) { + rep._finalize(idx); } // synchronizes all internal data structures -- has to be called before and after any multithreaded access! void sync() { rep._sync(); } @@ -131,6 +144,10 @@ namespace phat { *this = other; } + boundary_matrix( const boundary_matrix& other) { + *this = other; + } + template< typename OtherRepresentation > bool operator==( const boundary_matrix< OtherRepresentation >& other_boundary_matrix ) const { const index number_of_columns = this->get_num_cols(); @@ -154,20 +171,30 @@ namespace phat { return !( *this == other_boundary_matrix ); } + template< typename OtherRepresentation > - boundary_matrix< Representation >& operator=( const boundary_matrix< OtherRepresentation >& other ) + boundary_matrix< Representation >& assign(const boundary_matrix< OtherRepresentation >& other) { + const index nr_of_columns = other.get_num_cols(); + this->set_num_cols( nr_of_columns ); + column temp_col; + for( index cur_col = 0; cur_col < nr_of_columns; cur_col++ ) { + this->set_dim( cur_col, other.get_dim( cur_col ) ); + other.get_col( cur_col, temp_col ); + this->set_col( cur_col, temp_col ); + } + // by convention, always return *this + return *this; + } + + boundary_matrix< Representation >& operator=( const boundary_matrix< Representation >& other ) { - const index nr_of_columns = other.get_num_cols(); - this->set_num_cols( nr_of_columns ); - column temp_col; - for( index cur_col = 0; cur_col < nr_of_columns; cur_col++ ) { - this->set_dim( cur_col, other.get_dim( cur_col ) ); - other.get_col( cur_col, temp_col ); - this->set_col( cur_col, temp_col ); - } + return assign(other); + } - // by convention, always return *this - return *this; + template< typename OtherRepresentation > + boundary_matrix< Representation >& operator=( const boundary_matrix< OtherRepresentation >& other ) + { + return assign(other); } // I/O -- independent of chosen 'Representation' @@ -181,6 +208,7 @@ namespace phat { column temp_col; #pragma omp parallel for private( temp_col ) for( index cur_col = 0; cur_col < nr_of_columns; cur_col++ ) { + //std::cout << "At index " << cur_col << " of " << nr_of_columns << " " << omp_get_thread_num() << std::endl; this->set_dim( cur_col, (dimension)input_dims[ cur_col ] ); index num_rows = input_matrix[ cur_col ].size(); -- cgit v1.2.3 From 0fbd1f5197e69aee959d3eab134c2792f56fface Mon Sep 17 00:00:00 2001 From: Michael Kerber Date: Mon, 24 Aug 2020 14:16:18 +0200 Subject: New method "set_dimension" to control the number of rows in the matrix, if needed --- include/phat/boundary_matrix.h | 8 +++++++- include/phat/representations/Pivot_representation.h | 6 +++--- include/phat/representations/Uniform_representation.h | 3 ++- include/phat/representations/heap_column_rep.h | 4 ++++ include/phat/representations/list_column_rep.h | 4 ++++ include/phat/representations/set_column_rep.h | 4 ++++ include/phat/representations/vector_column_rep.h | 4 ++++ 7 files changed, 28 insertions(+), 5 deletions(-) (limited to 'include/phat/boundary_matrix.h') diff --git a/include/phat/boundary_matrix.h b/include/phat/boundary_matrix.h index 295cfa5..d1d6257 100644 --- a/include/phat/boundary_matrix.h +++ b/include/phat/boundary_matrix.h @@ -37,8 +37,14 @@ namespace phat { // get overall number of columns in boundary_matrix index get_num_cols() const { return rep._get_num_cols(); } + // sets the number of rows (1st parameter) and columns (2nd parameter) + // of the matrix. Most internal types ignore the number of rows + // but some do no + void set_dimensions( index nr_of_rows, index nr_of_columns ) {rep._set_dimensions( nr_of_rows, nr_of_columns );} + // set overall number of columns in boundary_matrix - void set_num_cols( index nr_of_columns ) { rep._set_num_cols( nr_of_columns ); } + // sets the number of rows to nr_of_columns as well! + void set_num_cols( index nr_of_columns ) { rep._set_dimensions( nr_of_columns, nr_of_columns ); } // get dimension of given index dimension get_dim( index idx ) const { return rep._get_dim( idx ); } diff --git a/include/phat/representations/Pivot_representation.h b/include/phat/representations/Pivot_representation.h index 324c888..77f8746 100644 --- a/include/phat/representations/Pivot_representation.h +++ b/include/phat/representations/Pivot_representation.h @@ -71,13 +71,13 @@ template public: - void _set_num_cols( index nr_of_cols ) { + void _set_dimensions( index nr_of_rows, index nr_of_cols ) { #pragma omp parallel for for( int tid = 0; tid < omp_get_num_threads(); tid++ ) { - pivot_cols[ tid ].init( nr_of_cols ); + pivot_cols[ tid ].init( nr_of_rows ); idx_of_pivot_cols[ tid ] = -1; } - Base::_set_num_cols( nr_of_cols ); + Base::_set_dimensions( nr_of_rows, nr_of_cols ); } void _add_to( index source, index target ) { diff --git a/include/phat/representations/Uniform_representation.h b/include/phat/representations/Uniform_representation.h index ccbf6a3..b31e275 100644 --- a/include/phat/representations/Uniform_representation.h +++ b/include/phat/representations/Uniform_representation.h @@ -54,9 +54,10 @@ class Uniform_representation { return col_traits.get_size(matrix); } - void _set_num_cols(index nr_of_columns) { + void _set_dimensions(index nr_of_rows, index nr_of_columns) { col_traits.resize(matrix, nr_of_columns); for(index idx = 0;idx < nr_of_columns;idx++) { + col_traits.col_at(matrix,idx)._set_nr_of_rows(nr_of_rows); col_traits.col_at(matrix,idx).offer_thread_local_storage(&temp_column_buffer); } dim_traits.resize(dims, nr_of_columns); diff --git a/include/phat/representations/heap_column_rep.h b/include/phat/representations/heap_column_rep.h index 42dda3f..cc47bb3 100644 --- a/include/phat/representations/heap_column_rep.h +++ b/include/phat/representations/heap_column_rep.h @@ -104,6 +104,10 @@ namespace phat { std::make_heap( indices.begin( ), indices.end( ) ); } + void _set_nr_of_rows( int nr_of_rows ) { + // ignore + } + // true iff boundary of given idx is empty bool _is_empty() const { diff --git a/include/phat/representations/list_column_rep.h b/include/phat/representations/list_column_rep.h index 5de2652..bd1200e 100644 --- a/include/phat/representations/list_column_rep.h +++ b/include/phat/representations/list_column_rep.h @@ -54,6 +54,10 @@ namespace phat { std::copy (col.begin(), col.end(), indices.begin() ); } + void _set_nr_of_rows( int nr_of_rows ) { + // ignore + } + // true iff boundary of given idx is empty bool _is_empty() const { return indices.empty(); diff --git a/include/phat/representations/set_column_rep.h b/include/phat/representations/set_column_rep.h index c43b74e..1acb9fd 100644 --- a/include/phat/representations/set_column_rep.h +++ b/include/phat/representations/set_column_rep.h @@ -52,6 +52,10 @@ namespace phat { indices.insert( col.begin(), col.end() ); } + void _set_nr_of_rows( int nr_of_rows ) { + // ignore + } + // true iff boundary of given idx is empty bool _is_empty() const { return indices.empty(); diff --git a/include/phat/representations/vector_column_rep.h b/include/phat/representations/vector_column_rep.h index 22c37ef..babb0df 100644 --- a/include/phat/representations/vector_column_rep.h +++ b/include/phat/representations/vector_column_rep.h @@ -54,6 +54,10 @@ namespace phat { indices = col; } + void _set_nr_of_rows( int nr_of_rows ) { + // ignore + } + // true iff boundary of given idx is empty bool _is_empty() const { return indices.empty(); -- cgit v1.2.3