Armadillo 15.6.2

Author: eddelbuettel

ChangeLog

@@ -1,3 +1,7 @@
+2026-10-16  Dirk Eddelbuettel  <edd@debian.org>
+
+	* inst/include/armadillo_bits/*: Armadillo 15.6.2
+
 2026-10-02  Dirk Eddelbuettel  <edd@debian.org>
 
 	* DESCRIPTION (Version, Date): RcppArmadillo 15.6.1-1

inst/include/armadillo_bits/Mat_meat.hpp

@@ -5504,6 +5504,18 @@ Mat<eT>::Mat(const eOp<T1, eop_type>& X)
     if(eT_ok && (X.aux == eT(0.5)))  {   eop_sqrt::apply(*this, reinterpret_cast< const eOp<T1, eop_sqrt  >& >(X)); return; }
     }
 
+  if(is_gen_eye<T1>::value && is_same_type<eop_type, eop_scalar_times>::value)
+    {
+    zeros();
+    
+    const eT    k = X.aux;
+    const uword N = (std::min)(n_rows, n_cols);
+    
+    for(uword ii=0; ii < N; ++ii)  { at(ii,ii) = k; }
+    
+    return;
+    }
+  
   eop_type::apply(*this, X);
   }
 
@@ -5534,6 +5546,18 @@ Mat<eT>::operator=(const eOp<T1, eop_type>& X)
     if(eT_ok && (X.aux == eT(0.5)))  {   eop_sqrt::apply(*this, reinterpret_cast< const eOp<T1, eop_sqrt  >& >(X)); return *this; }
     }
 
+  if(is_gen_eye<T1>::value && is_same_type<eop_type, eop_scalar_times>::value)
+    {
+    zeros();
+    
+    const eT    k = X.aux;
+    const uword N = (std::min)(n_rows, n_cols);
+    
+    for(uword ii=0; ii < N; ++ii)  { at(ii,ii) = k; }
+    
+    return *this;
+    }
+  
   eop_type::apply(*this, X);
 
   return *this;
@@ -5563,6 +5587,18 @@ Mat<eT>::operator+=(const eOp<T1, eop_type>& X)
     if(eT_ok && (X.aux == eT(0.5)))  {   eop_sqrt::apply_inplace_plus(*this, reinterpret_cast< const eOp<T1, eop_sqrt  >& >(X)); return *this; }
     }
 
+  if(is_gen_eye<T1>::value && is_same_type<eop_type, eop_scalar_times>::value)
+    {
+    arma_conform_assert_same_size(n_rows, n_cols, X.get_n_rows(), X.get_n_cols(), "addition");
+    
+    const eT    k = X.aux;
+    const uword N = (std::min)(n_rows, n_cols);
+    
+    for(uword ii=0; ii < N; ++ii)  { at(ii,ii) += k; }
+    
+    return *this;
+    }
+  
   eop_type::apply_inplace_plus(*this, X);
 
   return *this;
@@ -5592,6 +5628,18 @@ Mat<eT>::operator-=(const eOp<T1, eop_type>& X)
     if(eT_ok && (X.aux == eT(0.5)))  {   eop_sqrt::apply_inplace_minus(*this, reinterpret_cast< const eOp<T1, eop_sqrt  >& >(X)); return *this; }
     }
 
+  if(is_gen_eye<T1>::value && is_same_type<eop_type, eop_scalar_times>::value)
+    {
+    arma_conform_assert_same_size(n_rows, n_cols, X.get_n_rows(), X.get_n_cols(), "subtraction");
+    
+    const eT    k = X.aux;
+    const uword N = (std::min)(n_rows, n_cols);
+    
+    for(uword ii=0; ii < N; ++ii)  { at(ii,ii) -= k; }
+    
+    return *this;
+    }
+  
   eop_type::apply_inplace_minus(*this, X);
 
   return *this;

inst/include/armadillo_bits/arma_version.hpp

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

inst/include/armadillo_bits/traits.hpp

@@ -444,6 +444,19 @@ struct is_op_diagmat< const Op<T1,op_diagmat> >
   { static constexpr bool value = true; };
 
 
+template<typename T>
+struct is_gen_eye
+  { static constexpr bool value = false; };
+
+template<typename eT>
+struct is_gen_eye< Gen<Mat<eT>, gen_eye> >
+  { static constexpr bool value = true; };
+
+template<typename eT>
+struct is_gen_eye< const Gen<Mat<eT>, gen_eye> >
+  { static constexpr bool value = true; };
+
+
 //
 //