| GenCube_bones.hpp | GenCube_bones.hpp | |||
|---|---|---|---|---|
| skipping to change at line 21 | skipping to change at line 21 | |||
| //! support class for generator functions (eg. zeros, randu, randn, ...) | //! support class for generator functions (eg. zeros, randu, randn, ...) | |||
| template<typename eT, typename gen_type> | template<typename eT, typename gen_type> | |||
| class GenCube : public BaseCube<eT, GenCube<eT, gen_type> > | class GenCube : public BaseCube<eT, GenCube<eT, gen_type> > | |||
| { | { | |||
| public: | public: | |||
| typedef eT elem_type; | typedef eT elem_type; | |||
| typedef typename get_pod_type<elem_type>::result pod_type; | typedef typename get_pod_type<elem_type>::result pod_type; | |||
| static const bool prefer_at_accessor = false; | static const bool prefer_at_accessor = false; | |||
| static const bool is_simple = (is_same_type<gen_type, gen_ones_f ull>::value) || (is_same_type<gen_type, gen_zeros>::value); | ||||
| arma_aligned const uword n_rows; | arma_aligned const uword n_rows; | |||
| arma_aligned const uword n_cols; | arma_aligned const uword n_cols; | |||
| arma_aligned const uword n_slices; | arma_aligned const uword n_slices; | |||
| arma_inline GenCube(const uword in_n_rows, const uword in_n_cols, const uword in_n_slices); | arma_inline GenCube(const uword in_n_rows, const uword in_n_cols, const uword in_n_slices); | |||
| arma_inline ~GenCube(); | arma_inline ~GenCube(); | |||
| arma_inline static eT generate(); | arma_inline static eT generate(); | |||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 1 lines changed or added | |||
| Gen_bones.hpp | Gen_bones.hpp | |||
|---|---|---|---|---|
| skipping to change at line 21 | skipping to change at line 21 | |||
| //! support class for generator functions (eg. zeros, randu, randn, ...) | //! support class for generator functions (eg. zeros, randu, randn, ...) | |||
| template<typename T1, typename gen_type> | template<typename T1, typename gen_type> | |||
| class Gen : public Base<typename T1::elem_type, Gen<T1, gen_type> > | class Gen : public Base<typename T1::elem_type, Gen<T1, gen_type> > | |||
| { | { | |||
| public: | public: | |||
| typedef typename T1::elem_type elem_type; | typedef typename T1::elem_type elem_type; | |||
| typedef typename get_pod_type<elem_type>::result pod_type; | typedef typename get_pod_type<elem_type>::result pod_type; | |||
| static const bool prefer_at_accessor = (is_same_type<gen_type, gen_ones_d iag>::value) ? true : false; | static const bool prefer_at_accessor = (is_same_type<gen_type, gen_ones_d iag>::value) ? true : false; | |||
| static const bool is_simple = (is_same_type<gen_type, gen_ones_f ull>::value) || (is_same_type<gen_type, gen_zeros>::value); | ||||
| static const bool is_row = T1::is_row; | static const bool is_row = T1::is_row; | |||
| static const bool is_col = T1::is_col; | static const bool is_col = T1::is_col; | |||
| arma_aligned const uword n_rows; | arma_aligned const uword n_rows; | |||
| arma_aligned const uword n_cols; | arma_aligned const uword n_cols; | |||
| arma_inline Gen(const uword in_n_rows, const uword in_n_cols); | arma_inline Gen(const uword in_n_rows, const uword in_n_cols); | |||
| arma_inline ~Gen(); | arma_inline ~Gen(); | |||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 1 lines changed or added | |||
| Proxy.hpp | Proxy.hpp | |||
|---|---|---|---|---|
| skipping to change at line 264 | skipping to change at line 264 | |||
| arma_inline elem_type operator[] (const uword i) const { return Q[i]; } | arma_inline elem_type operator[] (const uword i) const { return Q[i]; } | |||
| arma_inline elem_type at (const uword row, const uword col) const { return Q.at(row, col); } | arma_inline elem_type at (const uword row, const uword col) const { return Q.at(row, col); } | |||
| arma_inline elem_type at_alt (const uword i) const { return Q[i]; } | arma_inline elem_type at_alt (const uword i) const { return Q[i]; } | |||
| arma_inline ea_type get_ea() const { return Q; } | arma_inline ea_type get_ea() const { return Q; } | |||
| arma_inline aligned_ea_type get_aligned_ea() const { return Q; } | arma_inline aligned_ea_type get_aligned_ea() const { return Q; } | |||
| template<typename eT2> | template<typename eT2> | |||
| arma_inline bool is_alias(const Mat<eT2>&) const { return false; } | arma_inline bool is_alias(const Mat<eT2>&) const { return false; } | |||
| arma_inline bool is_aligned() const { return false; } | arma_inline bool is_aligned() const { return Gen<T1, gen_type>::is_simple ; } | |||
| }; | }; | |||
| template<typename T1, typename op_type> | template<typename T1, typename op_type> | |||
| class Proxy< Op<T1, op_type> > | class Proxy< Op<T1, op_type> > | |||
| { | { | |||
| public: | public: | |||
| typedef typename T1::elem_type elem_type; | typedef typename T1::elem_type elem_type; | |||
| typedef typename get_pod_type<elem_type>::result pod_type; | typedef typename get_pod_type<elem_type>::result pod_type; | |||
| typedef Mat<elem_type> stored_type; | typedef Mat<elem_type> stored_type; | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||
| ProxyCube.hpp | ProxyCube.hpp | |||
|---|---|---|---|---|
| skipping to change at line 95 | skipping to change at line 95 | |||
| } | } | |||
| arma_inline uword get_n_rows() const { return Q.n_rows; } | arma_inline uword get_n_rows() const { return Q.n_rows; } | |||
| arma_inline uword get_n_cols() const { return Q.n_cols; } | arma_inline uword get_n_cols() const { return Q.n_cols; } | |||
| arma_inline uword get_n_elem_slice() const { return Q.n_rows*Q.n_cols; } | arma_inline uword get_n_elem_slice() const { return Q.n_rows*Q.n_cols; } | |||
| arma_inline uword get_n_slices() const { return Q.n_slices; } | arma_inline uword get_n_slices() const { return Q.n_slices; } | |||
| arma_inline uword get_n_elem() const { return Q.n_rows*Q.n_cols*Q.n _slices; } | arma_inline uword get_n_elem() const { return Q.n_rows*Q.n_cols*Q.n _slices; } | |||
| arma_inline elem_type operator[] (const uword i) const { return Q[i]; } | arma_inline elem_type operator[] (const uword i) const { return Q[i]; } | |||
| arma_inline elem_type at (const uword row, const uword col, const uword slice) const { return Q.at(row, col, slice); } | arma_inline elem_type at (const uword row, const uword col, const uword slice) const { return Q.at(row, col, slice); } | |||
| arma_inline elem_type at_alt (const uword i) const { return Q.at_alt(i); } | arma_inline elem_type at_alt (const uword i) const { return Q[i]; } | |||
| arma_inline ea_type get_ea() const { return Q; } | arma_inline ea_type get_ea() const { return Q; } | |||
| arma_inline aligned_ea_type get_aligned_ea() const { return Q; } | arma_inline aligned_ea_type get_aligned_ea() const { return Q; } | |||
| template<typename eT2> | template<typename eT2> | |||
| arma_inline bool is_alias(const Cube<eT2>&) const { return false; } | arma_inline bool is_alias(const Cube<eT2>&) const { return false; } | |||
| arma_inline bool is_aligned() const { return false; } | arma_inline bool is_aligned() const { return GenCube<eT, gen_type>::is_si mple; } | |||
| }; | }; | |||
| template<typename T1, typename op_type> | template<typename T1, typename op_type> | |||
| class ProxyCube< OpCube<T1, op_type> > | class ProxyCube< OpCube<T1, op_type> > | |||
| { | { | |||
| public: | public: | |||
| typedef typename T1::elem_type elem_type; | typedef typename T1::elem_type elem_type; | |||
| typedef typename get_pod_type<elem_type>::result pod_type; | typedef typename get_pod_type<elem_type>::result pod_type; | |||
| typedef Cube<elem_type> stored_type; | typedef Cube<elem_type> stored_type; | |||
| 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 3 | #define ARMA_VERSION_MAJOR 3 | |||
| #define ARMA_VERSION_MINOR 900 | #define ARMA_VERSION_MINOR 900 | |||
| #define ARMA_VERSION_PATCH 0 | #define ARMA_VERSION_PATCH 1 | |||
| #define ARMA_VERSION_NAME "Bavarian Sunflower" | #define ARMA_VERSION_NAME "Bavarian Sunflower" | |||
| 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 | |||