Armadillo 15.2.1

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,7 @@
+2025-10-28  Dirk Eddelbuettel  <[email protected]>
+
+	* inst/include/current/: Sync with Armadillo 15.2.1
+
 2025-10-21  Dirk Eddelbuettel  <[email protected]>
 
 	* inst/tinytest/test_misc.R: Tests for armadillo_version_typed()

inst/include/current/armadillo_bits/arma_version.hpp

@@ -23,7 +23,7 @@
 
 #define ARMA_VERSION_MAJOR 15
 #define ARMA_VERSION_MINOR 2
-#define ARMA_VERSION_PATCH 0
+#define ARMA_VERSION_PATCH 1
 #define ARMA_VERSION_NAME  "Medium Roast Deluxe"
 
 

inst/include/current/armadillo_bits/op_accu_meat.hpp

@@ -602,7 +602,30 @@ op_accu_mat::apply(const subview<eT>& X)
   const uword X_n_rows = X.n_rows;
   const uword X_n_cols = X.n_cols;
 
-  if(X_n_rows == 1)  { return op_accu_mat::apply( static_cast< const subview_row<eT>& >(X) ); }
+  if(X_n_rows == 1)
+    {
+    const uword X_m_n_rows = X.m.n_rows;
+    
+    const eT* mem_ptr = X.colptr(0);
+    
+    eT val1 = eT(0);
+    eT val2 = eT(0);
+    
+    uword j;
+    
+    for(j=1; j < X_n_cols; j+=2)
+      {
+      val1 += (*mem_ptr); mem_ptr += X_m_n_rows;
+      val2 += (*mem_ptr); mem_ptr += X_m_n_rows;
+      }
+    
+    if((j-1) < X_n_cols)
+      {
+      val1 += (*mem_ptr);
+      }
+    
+    return val1 + val2;
+    }
 
   if(X_n_cols == 1)  { return arrayops::accumulate( X.colptr(0), X_n_rows ); }
 
@@ -640,7 +663,7 @@ op_accu_mat::apply(const subview_row<eT>& X)
   const uword X_m_n_rows = X.m.n_rows;
   const uword X_n_cols   = X.n_cols;
 
-  const eT* row_mem = &(X.m.at(X.aux_row1,X.aux_col1));
+  const eT* mem_ptr = X.rowmem;
 
   eT val1 = eT(0);
   eT val2 = eT(0);
@@ -649,13 +672,13 @@ op_accu_mat::apply(const subview_row<eT>& X)
 
   for(j=1; j < X_n_cols; j+=2)
     {
-    val1 += (*row_mem); row_mem += X_m_n_rows;
-    val2 += (*row_mem); row_mem += X_m_n_rows;
+    val1 += (*mem_ptr); mem_ptr += X_m_n_rows;
+    val2 += (*mem_ptr); mem_ptr += X_m_n_rows;
     }
 
   if((j-1) < X_n_cols)
     {
-    val1 += (*row_mem);
+    val1 += (*mem_ptr);
     }
 
   return val1 + val2;

inst/include/current/armadillo_bits/subview_bones.hpp

@@ -85,7 +85,7 @@ class subview : public Base< eT, subview<eT> >
   template<typename T1> inline void operator-= (const SpBase<eT,T1>& x);
   template<typename T1> inline void operator%= (const SpBase<eT,T1>& x);
   template<typename T1> inline void operator/= (const SpBase<eT,T1>& x);
-
+  
   template<typename T1, typename gen_type>
   inline typename enable_if2< is_same_type<typename T1::elem_type, eT>::value, void>::result operator=(const Gen<T1,gen_type>& x);
 
@@ -396,6 +396,11 @@ class subview_col : public subview<eT>
   inline void zeros();
   inline void ones();
 
+  arma_warn_unused inline bool is_finite() const;
+  
+  arma_warn_unused inline bool has_inf() const;
+  arma_warn_unused inline bool has_nan() const;
+  
   arma_inline eT  at_alt    (const uword i) const;
 
   arma_inline eT& operator[](const uword i);
@@ -528,6 +533,8 @@ class subview_row : public subview<eT>
   static constexpr bool is_col  = false;
   static constexpr bool is_xvec = false;
 
+  const eT* rowmem;
+  
   inline void operator= (const subview<eT>& x);
   inline void operator= (const subview_row& x);
   inline void operator= (const eT val);
@@ -545,6 +552,15 @@ class subview_row : public subview<eT>
 
   arma_warn_unused arma_inline const Op<subview_row<eT>,op_strans> as_col() const;
 
+  inline void fill(const eT val);
+  inline void zeros();
+  inline void ones();
+  
+  arma_warn_unused inline bool is_finite() const;
+  
+  arma_warn_unused inline bool has_inf() const;
+  arma_warn_unused inline bool has_nan() const;
+  
   inline eT  at_alt    (const uword i) const;
 
   inline eT& operator[](const uword i);