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 320 #define ARMA_VERSION_MINOR 320
#define ARMA_VERSION_PATCH 0 #define ARMA_VERSION_PATCH 1
#define ARMA_VERSION_NAME "Daintree Tea Raider" #define ARMA_VERSION_NAME "Daintree Tea Raider"
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


 compiler_setup.hpp   compiler_setup.hpp 
skipping to change at line 265 skipping to change at line 265
#error "*** Need a newer compiler ***" #error "*** Need a newer compiler ***"
#endif #endif
#undef ARMA_HAVE_SNPRINTF #undef ARMA_HAVE_SNPRINTF
#undef ARMA_HAVE_ISFINITE #undef ARMA_HAVE_ISFINITE
#undef ARMA_HAVE_LOG1P #undef ARMA_HAVE_LOG1P
#undef ARMA_HAVE_TR1 #undef ARMA_HAVE_TR1
#endif #endif
#if defined(__CUDACC__) #if defined(__NVCC__)
#undef ARMA_HAVE_SNPRINTF #undef ARMA_HAVE_SNPRINTF
#undef ARMA_HAVE_ISFINITE #undef ARMA_HAVE_ISFINITE
#undef ARMA_HAVE_LOG1P #undef ARMA_HAVE_LOG1P
#undef ARMA_HAVE_TR1 #undef ARMA_HAVE_TR1
#undef arma_noinline
#define arma_noinline
#endif #endif
#if defined(log2) #if defined(log2)
#undef log2 #undef log2
#pragma message ("detected 'log2' macro and undefined it") #pragma message ("detected 'log2' macro and undefined it")
#endif #endif
// //
// whoever defined macros with the names "min" and "max" should be permanen tly removed from the gene pool // whoever defined macros with the names "min" and "max" should be permanen tly removed from the gene pool
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 config.hpp   config.hpp 
skipping to change at line 170 skipping to change at line 170
#endif #endif
#endif #endif
#if defined(ARMA_DONT_USE_CXX11_RNG) #if defined(ARMA_DONT_USE_CXX11_RNG)
#undef ARMA_USE_CXX11_RNG #undef ARMA_USE_CXX11_RNG
#endif #endif
#if defined(ARMA_DONT_USE_HDF5) #if defined(ARMA_DONT_USE_HDF5)
#undef ARMA_USE_HDF5 #undef ARMA_USE_HDF5
#endif #endif
#if defined(H5_USE_16_API_DEFAULT) || defined(H5_USE_16_API)
// #pragma message ("disabling use of HDF5 due to its incompatible config
uration")
#undef ARMA_USE_HDF5
#endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 0 lines changed or added


 running_stat_meat.hpp   running_stat_meat.hpp 
skipping to change at line 103 skipping to change at line 103
} }
else else
{ {
return d_count - eT(1); return d_count - eT(1);
} }
} }
// //
template<typename eT> template<typename eT>
inline
running_stat<eT>::~running_stat() running_stat<eT>::~running_stat()
{ {
arma_extra_debug_sigprint_this(this); arma_extra_debug_sigprint_this(this);
} }
template<typename eT> template<typename eT>
inline
running_stat<eT>::running_stat() running_stat<eT>::running_stat()
: r_mean ( eT(0)) : r_mean ( eT(0))
, r_var (typename running_stat<eT>::T(0)) , r_var (typename running_stat<eT>::T(0))
, min_val ( eT(0)) , min_val ( eT(0))
, max_val ( eT(0)) , max_val ( eT(0))
, min_val_norm(typename running_stat<eT>::T(0)) , min_val_norm(typename running_stat<eT>::T(0))
, max_val_norm(typename running_stat<eT>::T(0)) , max_val_norm(typename running_stat<eT>::T(0))
{ {
arma_extra_debug_sigprint_this(this); arma_extra_debug_sigprint_this(this);
} }
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 running_stat_vec_meat.hpp   running_stat_vec_meat.hpp 
skipping to change at line 12 skipping to change at line 12
// Copyright (C) 2009-2013 NICTA (www.nicta.com.au) // Copyright (C) 2009-2013 NICTA (www.nicta.com.au)
// //
// 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 running_stat_vec //! \addtogroup running_stat_vec
//! @{ //! @{
template<typename obj_type> template<typename obj_type>
inline
running_stat_vec<obj_type>::~running_stat_vec() running_stat_vec<obj_type>::~running_stat_vec()
{ {
arma_extra_debug_sigprint_this(this); arma_extra_debug_sigprint_this(this);
} }
template<typename obj_type> template<typename obj_type>
inline
running_stat_vec<obj_type>::running_stat_vec(const bool in_calc_cov) running_stat_vec<obj_type>::running_stat_vec(const bool in_calc_cov)
: calc_cov(in_calc_cov) : calc_cov(in_calc_cov)
{ {
arma_extra_debug_sigprint_this(this); arma_extra_debug_sigprint_this(this);
} }
template<typename obj_type> template<typename obj_type>
inline
running_stat_vec<obj_type>::running_stat_vec(const running_stat_vec<obj_typ e>& in_rsv) running_stat_vec<obj_type>::running_stat_vec(const running_stat_vec<obj_typ e>& in_rsv)
: calc_cov (in_rsv.calc_cov) : calc_cov (in_rsv.calc_cov)
, counter (in_rsv.counter) , counter (in_rsv.counter)
, r_mean (in_rsv.r_mean) , r_mean (in_rsv.r_mean)
, r_var (in_rsv.r_var) , r_var (in_rsv.r_var)
, r_cov (in_rsv.r_cov) , r_cov (in_rsv.r_cov)
, min_val (in_rsv.min_val) , min_val (in_rsv.min_val)
, max_val (in_rsv.max_val) , max_val (in_rsv.max_val)
, min_val_norm(in_rsv.min_val_norm) , min_val_norm(in_rsv.min_val_norm)
, max_val_norm(in_rsv.max_val_norm) , max_val_norm(in_rsv.max_val_norm)
{ {
arma_extra_debug_sigprint_this(this); arma_extra_debug_sigprint_this(this);
} }
template<typename obj_type> template<typename obj_type>
inline
const running_stat_vec<obj_type>& const running_stat_vec<obj_type>&
running_stat_vec<obj_type>::operator=(const running_stat_vec<obj_type>& in_ rsv) running_stat_vec<obj_type>::operator=(const running_stat_vec<obj_type>& in_ rsv)
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
access::rw(calc_cov) = in_rsv.calc_cov; access::rw(calc_cov) = in_rsv.calc_cov;
counter = in_rsv.counter; counter = in_rsv.counter;
r_mean = in_rsv.r_mean; r_mean = in_rsv.r_mean;
r_var = in_rsv.r_var; r_var = in_rsv.r_var;
 End of changes. 4 change blocks. 
0 lines changed or deleted 4 lines changed or added


 unwrap.hpp   unwrap.hpp 
skipping to change at line 415 skipping to change at line 415
typedef Mat<eT> stored_type; typedef Mat<eT> stored_type;
inline inline
unwrap_check(const Mat<eT>& A, const Mat<eT>& B) unwrap_check(const Mat<eT>& A, const Mat<eT>& B)
: M_local( (&A == &B) ? new Mat<eT>(A) : 0 ) : M_local( (&A == &B) ? new Mat<eT>(A) : 0 )
, M ( (&A == &B) ? (*M_local) : A ) , M ( (&A == &B) ? (*M_local) : A )
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
} }
inline
unwrap_check(const Mat<eT>& A, const bool is_alias) unwrap_check(const Mat<eT>& A, const bool is_alias)
: M_local( is_alias ? new Mat<eT>(A) : 0 ) : M_local( is_alias ? new Mat<eT>(A) : 0 )
, M ( is_alias ? (*M_local) : A ) , M ( is_alias ? (*M_local) : A )
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
} }
inline inline
~unwrap_check() ~unwrap_check()
{ {
skipping to change at line 448 skipping to change at line 449
typedef Row<eT> stored_type; typedef Row<eT> stored_type;
inline inline
unwrap_check(const Row<eT>& A, const Mat<eT>& B) unwrap_check(const Row<eT>& A, const Mat<eT>& B)
: M_local( (&A == &B) ? new Row<eT>(A) : 0 ) : M_local( (&A == &B) ? new Row<eT>(A) : 0 )
, M ( (&A == &B) ? (*M_local) : A ) , M ( (&A == &B) ? (*M_local) : A )
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
} }
inline
unwrap_check(const Row<eT>& A, const bool is_alias) unwrap_check(const Row<eT>& A, const bool is_alias)
: M_local( is_alias ? new Row<eT>(A) : 0 ) : M_local( is_alias ? new Row<eT>(A) : 0 )
, M ( is_alias ? (*M_local) : A ) , M ( is_alias ? (*M_local) : A )
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
} }
inline inline
~unwrap_check() ~unwrap_check()
{ {
skipping to change at line 481 skipping to change at line 483
typedef Col<eT> stored_type; typedef Col<eT> stored_type;
inline inline
unwrap_check(const Col<eT>& A, const Mat<eT>& B) unwrap_check(const Col<eT>& A, const Mat<eT>& B)
: M_local( (&A == &B) ? new Col<eT>(A) : 0 ) : M_local( (&A == &B) ? new Col<eT>(A) : 0 )
, M ( (&A == &B) ? (*M_local) : A ) , M ( (&A == &B) ? (*M_local) : A )
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
} }
inline
unwrap_check(const Col<eT>& A, const bool is_alias) unwrap_check(const Col<eT>& A, const bool is_alias)
: M_local( is_alias ? new Col<eT>(A) : 0 ) : M_local( is_alias ? new Col<eT>(A) : 0 )
, M ( is_alias ? (*M_local) : A ) , M ( is_alias ? (*M_local) : A )
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
} }
inline inline
~unwrap_check() ~unwrap_check()
{ {
 End of changes. 3 change blocks. 
0 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/