| 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 0 | #define ARMA_VERSION_PATCH 1 | |||
| #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 | |||
| op_dot_meat.hpp | op_dot_meat.hpp | |||
|---|---|---|---|---|
| skipping to change at line 235 | skipping to change at line 235 | |||
| return op_dot::direct_dot(A.n_elem, &A_mem[A.aux_col1], &B_mem[B.au x_col1]); | return op_dot::direct_dot(A.n_elem, &A_mem[A.aux_col1], &B_mem[B.au x_col1]); | |||
| } | } | |||
| } | } | |||
| const Proxy<T1> PA(X); | const Proxy<T1> PA(X); | |||
| const Proxy<T2> PB(Y); | const Proxy<T2> PB(Y); | |||
| arma_debug_check( (PA.get_n_elem() != PB.get_n_elem()), "dot(): objects must have the same number of elements" ); | arma_debug_check( (PA.get_n_elem() != PB.get_n_elem()), "dot(): objects must have the same number of elements" ); | |||
| if(is_Mat<typename Proxy<T1>::stored_type>::value && is_Mat<typename Pr | ||||
| oxy<T2>::stored_type>::value) | ||||
| { | ||||
| const quasi_unwrap<typename Proxy<T1>::stored_type> A(PA.Q); | ||||
| const quasi_unwrap<typename Proxy<T2>::stored_type> B(PB.Q); | ||||
| return op_dot::direct_dot(A.M.n_elem, A.M.memptr(), B.M.memptr()); | ||||
| } | ||||
| return op_dot::apply_proxy(PA,PB); | return op_dot::apply_proxy(PA,PB); | |||
| } | } | |||
| } | } | |||
| template<typename T1, typename T2> | template<typename T1, typename T2> | |||
| arma_hot | arma_hot | |||
| inline | inline | |||
| typename arma_not_cx<typename T1::elem_type>::result | typename arma_not_cx<typename T1::elem_type>::result | |||
| op_dot::apply_proxy(const Proxy<T1>& PA, const Proxy<T2>& PB) | op_dot::apply_proxy(const Proxy<T1>& PA, const Proxy<T2>& PB) | |||
| { | { | |||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 9 lines changed or added | |||