"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "include/armadillo_bits/SpRow_meat.hpp" between
armadillo-10.2.0.tar.xz and armadillo-10.2.1.tar.xz

About: Armadillo is a C++ linear algebra library (matrix maths) aiming towards a good balance between speed and ease of use.

SpRow_meat.hpp  (armadillo-10.2.0.tar.xz):SpRow_meat.hpp  (armadillo-10.2.1.tar.xz)
skipping to change at line 204 skipping to change at line 204
} }
//! remove specified columns //! remove specified columns
template<typename eT> template<typename eT>
inline inline
void void
SpRow<eT>::shed_col(const uword col_num) SpRow<eT>::shed_col(const uword col_num)
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
arma_debug_check( col_num >= SpMat<eT>::n_cols, "SpRow::shed_col(): out of bou nds"); arma_debug_check( col_num >= SpMat<eT>::n_cols, "SpRow::shed_col(): out of bou nds" );
shed_cols(col_num, col_num); shed_cols(col_num, col_num);
} }
//! remove specified columns //! remove specified columns
template<typename eT> template<typename eT>
inline inline
void void
SpRow<eT>::shed_cols(const uword in_col1, const uword in_col2) SpRow<eT>::shed_cols(const uword in_col1, const uword in_col2)
{ {
skipping to change at line 298 skipping to change at line 298
// //! insert N cols at the specified col position, // //! insert N cols at the specified col position,
// //! optionally setting the elements of the inserted cols to zero // //! optionally setting the elements of the inserted cols to zero
// template<typename eT> // template<typename eT>
// inline // inline
// void // void
// SpRow<eT>::insert_cols(const uword col_num, const uword N, const bool set_to_ zero) // SpRow<eT>::insert_cols(const uword col_num, const uword N, const bool set_to_ zero)
// { // {
// arma_extra_debug_sigprint(); // arma_extra_debug_sigprint();
// //
// // insertion at col_num == n_cols is in effect an append operation // // insertion at col_num == n_cols is in effect an append operation
// arma_debug_check( (col_num > SpMat<eT>::n_cols), "SpRow::insert_cols(): out of bounds"); // arma_debug_check( (col_num > SpMat<eT>::n_cols), "SpRow::insert_cols(): out of bounds" );
// //
// arma_debug_check( (set_to_zero == false), "SpRow::insert_cols(): cannot set elements to nonzero values"); // arma_debug_check( (set_to_zero == false), "SpRow::insert_cols(): cannot set elements to nonzero values" );
// //
// uword newVal = (col_num == 0) ? 0 : SpMat<eT>::col_ptrs[col_num]; // uword newVal = (col_num == 0) ? 0 : SpMat<eT>::col_ptrs[col_num];
// SpMat<eT>::col_ptrs.insert(col_num, N, newVal); // SpMat<eT>::col_ptrs.insert(col_num, N, newVal);
// uword* new_col_ptrs = memory::acquire<uword>(SpMat<eT>::n_cols + N); // uword* new_col_ptrs = memory::acquire<uword>(SpMat<eT>::n_cols + N);
// //
// arrayops::copy(new_col_ptrs, SpMat<eT>::col_ptrs, col_num); // arrayops::copy(new_col_ptrs, SpMat<eT>::col_ptrs, col_num);
// //
// uword fill_value = (col_num == 0) ? 0 : SpMat<eT>::col_ptrs[col_num - 1]; // uword fill_value = (col_num == 0) ? 0 : SpMat<eT>::col_ptrs[col_num - 1];
// arrayops::inplace_set(new_col_ptrs + col_num, fill_value, N); // arrayops::inplace_set(new_col_ptrs + col_num, fill_value, N);
// //
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)