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/representations/vector_column_rep.h | 102 +++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 include/phat/representations/vector_column_rep.h (limited to 'include/phat/representations/vector_column_rep.h') diff --git a/include/phat/representations/vector_column_rep.h b/include/phat/representations/vector_column_rep.h new file mode 100644 index 0000000..22c37ef --- /dev/null +++ b/include/phat/representations/vector_column_rep.h @@ -0,0 +1,102 @@ +/* Copyright 2013 IST Austria + Contributed by: Ulrich Bauer, Michael Kerber, Jan Reininghaus + + This file is part of PHAT. + + PHAT is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + PHAT is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with PHAT. If not, see . */ + +#pragma once + +#include + +namespace phat { + class vector_column_rep { + + protected: + + std::vector indices; + + thread_local_storage< column >* temp_column_buffer; + + public: + + typedef vector_column_rep Self; + + void offer_thread_local_storage(thread_local_storage< column >* tls) { + temp_column_buffer=tls; + } + + std::vector::const_iterator begin() const { + return indices.begin(); + } + + std::vector::const_iterator end() const { + return indices.end(); + } + + // replaces(!) content of 'col' with boundary of given index + void _get_col( column& col ) const { + col.clear(); + col = indices; + } + void _set_col( const column& col ) { + indices = col; + } + + // true iff boundary of given idx is empty + bool _is_empty() const { + return indices.empty(); + } + + // largest row index of given column idx (new name for lowestOne()) + index _get_max_index() const { + return indices.empty() ? -1 : indices.back(); + } + + // removes the maximal index of a column + void _remove_max() { + indices.pop_back(); + } + + // clears given column + void _clear() { + indices.clear(); + } + + // syncronizes all data structures (essential for openmp stuff) + void _sync() {} + + // adds column 'source' to column 'target' + void _add_to( const Self& source_col ) { + column& temp_col = (*temp_column_buffer)(); + + size_t new_size = source_col.indices.size() + this->indices.size(); + + if (new_size > temp_col.size()) temp_col.resize(new_size); + + std::vector::iterator col_end = std::set_symmetric_difference( this->indices.begin(), this->indices.end(), + source_col.indices.begin(), source_col.indices.end(), + temp_col.begin() ); + temp_col.erase(col_end, temp_col.end()); + + + this->indices.swap(temp_col); + } + + // finalizes given column + void _finalize() { + column(indices.begin(), indices.end()).swap(indices); + } + }; +} -- 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/representations/vector_column_rep.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