diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/phat/boundary_matrix.h | 8 | ||||
-rw-r--r-- | include/phat/representations/Pivot_representation.h | 6 | ||||
-rw-r--r-- | include/phat/representations/Uniform_representation.h | 3 | ||||
-rw-r--r-- | include/phat/representations/heap_column_rep.h | 4 | ||||
-rw-r--r-- | include/phat/representations/list_column_rep.h | 4 | ||||
-rw-r--r-- | include/phat/representations/set_column_rep.h | 4 | ||||
-rw-r--r-- | include/phat/representations/vector_column_rep.h | 4 |
7 files changed, 28 insertions, 5 deletions
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<typename BaseRepresentation, typename PivotColumn> 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(); |