| 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 3 | #define ARMA_VERSION_MAJOR 3 | |||
| #define ARMA_VERSION_MINOR 800 | #define ARMA_VERSION_MINOR 800 | |||
| #define ARMA_VERSION_PATCH 2 | #define ARMA_VERSION_PATCH 3 | |||
| #define ARMA_VERSION_NAME "Miami Beach" | #define ARMA_VERSION_NAME "Miami Beach" | |||
| 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 | |||
| spglue_times_meat.hpp | spglue_times_meat.hpp | |||
|---|---|---|---|---|
| skipping to change at line 209 | skipping to change at line 209 | |||
| // .set_min_size() can only enlarge the array to the specified size, | // .set_min_size() can only enlarge the array to the specified size, | |||
| // hence if we request a smaller size than already allocated, | // hence if we request a smaller size than already allocated, | |||
| // no new memory allocation is done | // no new memory allocation is done | |||
| uword cur_index = 0; | uword cur_index = 0; | |||
| while(last_ind != x_n_rows + 1) | while(last_ind != x_n_rows + 1) | |||
| { | { | |||
| const uword tmp = last_ind; | const uword tmp = last_ind; | |||
| // Check that it wasn't a "fake" nonzero element. | // Check that it wasn't a "fake" nonzero element. | |||
| if(sums[tmp] != 0) | if(sums[tmp] != eT(0)) | |||
| { | { | |||
| // Assign to next open position. | // Assign to next open position. | |||
| sorted_indices[cur_index] = tmp; | sorted_indices[cur_index] = tmp; | |||
| ++cur_index; | ++cur_index; | |||
| } | } | |||
| last_ind = index[tmp]; | last_ind = index[tmp]; | |||
| index[tmp] = x_n_rows; | index[tmp] = x_n_rows; | |||
| } | } | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||