| SpMat_meat.hpp | SpMat_meat.hpp | |||
|---|---|---|---|---|
| skipping to change at line 3711 | skipping to change at line 3711 | |||
| } | } | |||
| access::rw(values[i]) = vals[i]; | access::rw(values[i]) = vals[i]; | |||
| access::rw(row_indices[i]) = locs_i[0]; | access::rw(row_indices[i]) = locs_i[0]; | |||
| access::rw(col_ptrs[ locs_i[1] + 1 ])++; | access::rw(col_ptrs[ locs_i[1] + 1 ])++; | |||
| } | } | |||
| } | } | |||
| // Now fix the column pointers. | // Now fix the column pointers. | |||
| for (uword i = 0; i <= n_cols; ++i) | for (uword i = 0; i < n_cols; ++i) | |||
| { | { | |||
| access::rw(col_ptrs[i + 1]) += col_ptrs[i]; | access::rw(col_ptrs[i + 1]) += col_ptrs[i]; | |||
| } | } | |||
| } | } | |||
| template<typename eT> | template<typename eT> | |||
| inline | inline | |||
| void | void | |||
| SpMat<eT>::init_batch_add(const Mat<uword>& locs, const Mat<eT>& vals, cons t bool sort_locations) | SpMat<eT>::init_batch_add(const Mat<uword>& locs, const Mat<eT>& vals, cons t bool sort_locations) | |||
| { | { | |||
| skipping to change at line 3882 | skipping to change at line 3882 | |||
| access::rw(values[count]) = vals[i]; | access::rw(values[count]) = vals[i]; | |||
| access::rw(row_indices[count]) = locs_i[0]; | access::rw(row_indices[count]) = locs_i[0]; | |||
| access::rw(col_ptrs[ locs_i[1] + 1 ])++; | access::rw(col_ptrs[ locs_i[1] + 1 ])++; | |||
| } | } | |||
| } | } | |||
| } | } | |||
| // Now fix the column pointers. | // Now fix the column pointers. | |||
| for (uword i = 0; i <= n_cols; ++i) | for (uword i = 0; i < n_cols; ++i) | |||
| { | { | |||
| access::rw(col_ptrs[i + 1]) += col_ptrs[i]; | access::rw(col_ptrs[i + 1]) += col_ptrs[i]; | |||
| } | } | |||
| } | } | |||
| template<typename eT> | template<typename eT> | |||
| inline | inline | |||
| void | void | |||
| SpMat<eT>::mem_resize(const uword new_n_nonzero) | SpMat<eT>::mem_resize(const uword new_n_nonzero) | |||
| { | { | |||
| End of changes. 2 change blocks. | ||||
| 2 lines changed or deleted | 2 lines changed or added | |||
| arma_version.hpp | arma_version.hpp | |||
|---|---|---|---|---|
| skipping to change at line 13 | skipping to change at line 13 | |||
| // | // | |||
| // This Source Code Form is subject to the terms of the Mozilla Public | // This Source Code Form is subject to the terms of the Mozilla Public | |||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | // License, v. 2.0. If a copy of the MPL was not distributed with this | |||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/. | // file, You can obtain one at http://mozilla.org/MPL/2.0/. | |||
| //! \addtogroup arma_version | //! \addtogroup arma_version | |||
| //! @{ | //! @{ | |||
| #define ARMA_VERSION_MAJOR 4 | #define ARMA_VERSION_MAJOR 4 | |||
| #define ARMA_VERSION_MINOR 600 | #define ARMA_VERSION_MINOR 600 | |||
| #define ARMA_VERSION_PATCH 4 | #define ARMA_VERSION_PATCH 5 | |||
| #define ARMA_VERSION_NAME "Off The Reservation" | #define ARMA_VERSION_NAME "Off The Reservation" | |||
| struct arma_version | struct arma_version | |||
| { | { | |||
| static const unsigned int major = ARMA_VERSION_MAJOR; | static const unsigned int major = ARMA_VERSION_MAJOR; | |||
| static const unsigned int minor = ARMA_VERSION_MINOR; | static const unsigned int minor = ARMA_VERSION_MINOR; | |||
| static const unsigned int patch = ARMA_VERSION_PATCH; | static const unsigned int patch = ARMA_VERSION_PATCH; | |||
| static | static | |||
| inline | inline | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||