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 550 #define ARMA_VERSION_MINOR 550
#define ARMA_VERSION_PATCH 2 #define ARMA_VERSION_PATCH 3
#define ARMA_VERSION_NAME "Singapore Sling Deluxe" #define ARMA_VERSION_NAME "Singapore Sling Deluxe"
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 194 skipping to change at line 194
#undef ARMA_HAVE_TR1 #undef ARMA_HAVE_TR1
#undef ARMA_HAVE_GCC_ASSUME_ALIGNED #undef ARMA_HAVE_GCC_ASSUME_ALIGNED
#endif #endif
#undef ARMA_GCC_VERSION #undef ARMA_GCC_VERSION
#endif #endif
#if defined(_MSC_VER) #if defined(_MSC_VER)
#if (_MSC_VER < 1700) #if (_MSC_VER < 1600)
#error "*** Need a newer compiler ***" #error "*** Need a newer compiler ***"
#endif #endif
#if (_MSC_VER < 1700)
#pragma message ("WARNING: your C++ compiler is outdated and has incomp
lete support for the C++ standard; if something breaks, you get to keep all
the pieces")
#endif
#if defined(ARMA_USE_CXX11)
#if (_MSC_VER < 1800)
#pragma message ("WARNING: your C++ compiler is in C++11 mode, but it
has incomplete support for C++11 features; if something breaks, you get to
keep all the pieces")
#endif
#endif
#undef ARMA_SIMPLE_LOOPS #undef ARMA_SIMPLE_LOOPS
#define ARMA_SIMPLE_LOOPS #define ARMA_SIMPLE_LOOPS
#undef ARMA_GOOD_COMPILER #undef ARMA_GOOD_COMPILER
#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_inline // #undef arma_inline
 End of changes. 2 change blocks. 
1 lines changed or deleted 15 lines changed or added


 gmm_diag_meat.hpp   gmm_diag_meat.hpp 
skipping to change at line 1107 skipping to change at line 1107
avg += w * current_running_mean.mean(); avg += w * current_running_mean.mean();
} }
return avg; return avg;
} }
#else #else
{ {
running_mean_scalar<eT> running_mean; running_mean_scalar<eT> running_mean;
const uword N = X.n_cols;
for(uword i=0; i<N; ++i) for(uword i=0; i<N; ++i)
{ {
running_mean( internal_scalar_log_p( X.colptr(i), gaus_id ) ); running_mean( internal_scalar_log_p( X.colptr(i), gaus_id ) );
} }
return running_mean.mean(); return running_mean.mean();
} }
#endif #endif
} }
 End of changes. 1 change blocks. 
2 lines changed or deleted 0 lines changed or added


 op_diagvec_meat.hpp   op_diagvec_meat.hpp 
skipping to change at line 39 skipping to change at line 39
const uword n_cols = P.get_n_cols(); const uword n_cols = P.get_n_cols();
arma_debug_check arma_debug_check
( (
((row_offset > 0) && (row_offset >= n_rows)) || ((col_offset > 0) && (c ol_offset >= n_cols)), ((row_offset > 0) && (row_offset >= n_rows)) || ((col_offset > 0) && (c ol_offset >= n_cols)),
"diagvec(): requested diagonal is out of bounds" "diagvec(): requested diagonal is out of bounds"
); );
const uword len = (std::min)(n_rows - row_offset, n_cols - col_offset); const uword len = (std::min)(n_rows - row_offset, n_cols - col_offset);
if(is_Mat<typename Proxy<T1>::stored_type>::value) if( (is_Mat<typename Proxy<T1>::stored_type>::value) && (Proxy<T1>::fake_ mat == false) )
{ {
op_diagvec::apply_unwrap(out, P.Q, row_offset, col_offset, len); op_diagvec::apply_unwrap(out, P.Q, row_offset, col_offset, len);
} }
else else
{ {
if(P.is_alias(out) == false) if(P.is_alias(out) == false)
{ {
op_diagvec::apply_proxy(out, P, row_offset, col_offset, len); op_diagvec::apply_proxy(out, P, row_offset, col_offset, len);
} }
else else
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 op_reshape_meat.hpp   op_reshape_meat.hpp 
skipping to change at line 217 skipping to change at line 217
{ {
arma_extra_debug_sigprint(); arma_extra_debug_sigprint();
typedef typename T1::elem_type eT; typedef typename T1::elem_type eT;
const Proxy<T1> P(in.m); const Proxy<T1> P(in.m);
const uword in_n_rows = in.aux_uword_a; const uword in_n_rows = in.aux_uword_a;
const uword in_n_cols = in.aux_uword_b; const uword in_n_cols = in.aux_uword_b;
if(is_Mat<typename Proxy<T1>::stored_type>::value == true) if( (is_Mat<typename Proxy<T1>::stored_type>::value == true) && (Proxy<T1 >::fake_mat == false) )
{ {
// not checking for aliasing here, as this might be an inplace reshape // not checking for aliasing here, as this might be an inplace reshape
const unwrap<typename Proxy<T1>::stored_type> tmp(P.Q); const unwrap<typename Proxy<T1>::stored_type> tmp(P.Q);
op_reshape::apply_unwrap(out, tmp.M, in_n_rows, in_n_cols, uword(0)); op_reshape::apply_unwrap(out, tmp.M, in_n_rows, in_n_cols, uword(0));
} }
else else
{ {
if(P.is_alias(out)) if(P.is_alias(out))
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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/