Armadillo 15.4.90, a first rc for 15.6.0

Author: eddelbuettel

inst/include/armadillo

@@ -342,6 +342,7 @@ namespace arma
   #include "armadillo_bits/op_row_as_mat_bones.hpp"
   #include "armadillo_bits/op_col_as_mat_bones.hpp"
   #include "armadillo_bits/op_accu_bones.hpp"
+  #include "armadillo_bits/op_permute_bones.hpp"
   #include "armadillo_bits/op_sp_plus_bones.hpp"
   #include "armadillo_bits/op_sp_minus_bones.hpp"
   #include "armadillo_bits/op_sp_sum_bones.hpp"
@@ -381,6 +382,7 @@ namespace arma
   #include "armadillo_bits/glue_mvnrnd_bones.hpp"
   #include "armadillo_bits/glue_quantile_bones.hpp"
   #include "armadillo_bits/glue_powext_bones.hpp"
+  #include "armadillo_bits/glue_cubemul_bones.hpp"
 
   #include "armadillo_bits/gmm_misc_bones.hpp"
   #include "armadillo_bits/gmm_diag_bones.hpp"
@@ -616,6 +618,8 @@ namespace arma
   #include "armadillo_bits/fn_powext.hpp"
   #include "armadillo_bits/fn_diags_spdiags.hpp"
   #include "armadillo_bits/fn_balance.hpp"
+  #include "armadillo_bits/fn_permute.hpp"
+  #include "armadillo_bits/fn_cubemul.hpp"
 
   #include "armadillo_bits/fn_speye.hpp"
   #include "armadillo_bits/fn_spones.hpp"
@@ -802,6 +806,7 @@ namespace arma
   #include "armadillo_bits/op_row_as_mat_meat.hpp"
   #include "armadillo_bits/op_col_as_mat_meat.hpp"
   #include "armadillo_bits/op_accu_meat.hpp"
+  #include "armadillo_bits/op_permute_meat.hpp"
   #include "armadillo_bits/op_sp_plus_meat.hpp"
   #include "armadillo_bits/op_sp_minus_meat.hpp"
   #include "armadillo_bits/op_sp_sum_meat.hpp"
@@ -841,6 +846,7 @@ namespace arma
   #include "armadillo_bits/glue_mvnrnd_meat.hpp"
   #include "armadillo_bits/glue_quantile_meat.hpp"
   #include "armadillo_bits/glue_powext_meat.hpp"
+  #include "armadillo_bits/glue_cubemul_meat.hpp"
 
   #include "armadillo_bits/gmm_misc_meat.hpp"
   #include "armadillo_bits/gmm_diag_meat.hpp"

inst/include/armadillo_bits/BaseCube_bones.hpp

@@ -53,6 +53,10 @@ struct BaseCube
   {
   arma_inline const derived& get_ref() const;
 
+  arma_warn_unused inline const OpCube<derived,op_htrans>  t() const;
+  arma_warn_unused inline const OpCube<derived,op_htrans> ht() const;
+  arma_warn_unused inline const OpCube<derived,op_strans> st() const;
+  
   arma_cold inline void print(                           const std::string extra_text = "") const;
   arma_cold inline void print(std::ostream& user_stream, const std::string extra_text = "") const;
 

inst/include/armadillo_bits/BaseCube_meat.hpp

@@ -31,6 +31,36 @@ BaseCube<elem_type,derived>::get_ref() const
 
 
 
+template<typename elem_type, typename derived>
+inline
+const OpCube<derived,op_htrans>
+BaseCube<elem_type,derived>::t() const
+  {
+  return OpCube<derived,op_htrans>( static_cast<const derived&>(*this) );
+  }
+
+
+
+template<typename elem_type, typename derived>
+inline
+const OpCube<derived,op_htrans>
+BaseCube<elem_type,derived>::ht() const
+  {
+  return OpCube<derived,op_htrans>( static_cast<const derived&>(*this) );
+  }
+
+
+
+template<typename elem_type, typename derived>
+inline
+const OpCube<derived,op_strans>
+BaseCube<elem_type,derived>::st() const
+  {
+  return OpCube<derived,op_strans>( static_cast<const derived&>(*this) );
+  }
+
+
+
 template<typename elem_type, typename derived>
 inline
 void

inst/include/armadillo_bits/Cube_bones.hpp

@@ -406,14 +406,6 @@ class Cube : public BaseCube< eT, Cube<eT> >
   arma_cold inline bool load(const hdf5_name&    spec, const file_type type = hdf5_binary);
   arma_cold inline bool load(      std::istream& is,   const file_type type = auto_detect);
 
-  [[deprecated("use save() instead")]] inline bool quiet_save(const std::string   name, const file_type type = arma_binary) const;
-  [[deprecated("use save() instead")]] inline bool quiet_save(const hdf5_name&    spec, const file_type type = hdf5_binary) const;
-  [[deprecated("use save() instead")]] inline bool quiet_save(      std::ostream& os,   const file_type type = arma_binary) const;
-  
-  [[deprecated("use load() instead")]] inline bool quiet_load(const std::string   name, const file_type type = auto_detect);
-  [[deprecated("use load() instead")]] inline bool quiet_load(const hdf5_name&    spec, const file_type type = hdf5_binary);
-  [[deprecated("use load() instead")]] inline bool quiet_load(      std::istream& is,   const file_type type = auto_detect);
-  
 
   // iterators
 

inst/include/armadillo_bits/Cube_meat.hpp

@@ -4716,7 +4716,7 @@ Cube<eT>::save(const hdf5_name& spec, const file_type type) const
     {
     Cube<eT> tmp;
 
-    op_strans_cube::apply_noalias(tmp, (*this));
+    op_strans::apply_cube_noalias(tmp, (*this));
 
     save_okay = diskio::save_hdf5_binary(tmp, spec, err_msg);
     }
@@ -4879,7 +4879,7 @@ Cube<eT>::load(const hdf5_name& spec, const file_type type)
 
     load_okay = diskio::load_hdf5_binary(tmp, spec, err_msg);
 
-    if(load_okay)  { op_strans_cube::apply_noalias((*this), tmp); }
+    if(load_okay)  { op_strans::apply_cube_noalias((*this), tmp); }
     }
   else
     {
@@ -4967,78 +4967,6 @@ Cube<eT>::load(std::istream& is, const file_type type)
 
 
 
-template<typename eT>
-inline
-bool
-Cube<eT>::quiet_save(const std::string name, const file_type type) const
-  {
-  arma_debug_sigprint();
-  
-  return (*this).save(name, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-Cube<eT>::quiet_save(const hdf5_name& spec, const file_type type) const
-  {
-  arma_debug_sigprint();
-  
-  return (*this).save(spec, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-Cube<eT>::quiet_save(std::ostream& os, const file_type type) const
-  {
-  arma_debug_sigprint();
-  
-  return (*this).save(os, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-Cube<eT>::quiet_load(const std::string name, const file_type type)
-  {
-  arma_debug_sigprint();
-  
-  return (*this).load(name, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-Cube<eT>::quiet_load(const hdf5_name& spec, const file_type type)
-  {
-  arma_debug_sigprint();
-  
-  return (*this).load(spec, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-Cube<eT>::quiet_load(std::istream& is, const file_type type)
-  {
-  arma_debug_sigprint();
-  
-  return (*this).load(is, type);
-  }
-
-
-
 template<typename eT>
 inline
 typename Cube<eT>::iterator

inst/include/armadillo_bits/Mat_bones.hpp

@@ -583,16 +583,6 @@ class Mat : public Base< eT, Mat<eT> >
   arma_cold inline bool load(const  csv_name&    spec, const file_type type =   csv_ascii);
   arma_cold inline bool load(      std::istream& is,   const file_type type = auto_detect);
 
-  [[deprecated("use save() instead")]] inline bool quiet_save(const std::string   name, const file_type type = arma_binary) const;
-  [[deprecated("use save() instead")]] inline bool quiet_save(const hdf5_name&    spec, const file_type type = hdf5_binary) const;
-  [[deprecated("use save() instead")]] inline bool quiet_save(const  csv_name&    spec, const file_type type =   csv_ascii) const;
-  [[deprecated("use save() instead")]] inline bool quiet_save(      std::ostream& os,   const file_type type = arma_binary) const;
-  
-  [[deprecated("use load() instead")]] inline bool quiet_load(const std::string   name, const file_type type = auto_detect);
-  [[deprecated("use load() instead")]] inline bool quiet_load(const hdf5_name&    spec, const file_type type = hdf5_binary);
-  [[deprecated("use load() instead")]] inline bool quiet_load(const  csv_name&    spec, const file_type type =   csv_ascii);
-  [[deprecated("use load() instead")]] inline bool quiet_load(      std::istream& is,   const file_type type = auto_detect);
-  
 
   // for container-like functionality
 

inst/include/armadillo_bits/Mat_meat.hpp

@@ -8990,102 +8990,6 @@ Mat<eT>::load(std::istream& is, const file_type type)
 
 
 
-template<typename eT>
-inline
-bool
-Mat<eT>::quiet_save(const std::string name, const file_type type) const
-  {
-  arma_debug_sigprint();
-  
-  return (*this).save(name, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-Mat<eT>::quiet_save(const hdf5_name& spec, const file_type type) const
-  {
-  arma_debug_sigprint();
-  
-  return (*this).save(spec, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-Mat<eT>::quiet_save(const csv_name& spec, const file_type type) const
-  {
-  arma_debug_sigprint();
-  
-  return (*this).save(spec, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-Mat<eT>::quiet_save(std::ostream& os, const file_type type) const
-  {
-  arma_debug_sigprint();
-  
-  return (*this).save(os, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-Mat<eT>::quiet_load(const std::string name, const file_type type)
-  {
-  arma_debug_sigprint();
-  
-  return (*this).load(name, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-Mat<eT>::quiet_load(const hdf5_name& spec, const file_type type)
-  {
-  arma_debug_sigprint();
-  
-  return (*this).load(spec, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-Mat<eT>::quiet_load(const csv_name& spec, const file_type type)
-  {
-  arma_debug_sigprint();
-  
-  return (*this).load(spec, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-Mat<eT>::quiet_load(std::istream& is, const file_type type)
-  {
-  arma_debug_sigprint();
-  
-  return (*this).load(is, type);
-  }
-
-
-
 template<typename eT>
 inline
 Mat<eT>::row_iterator::row_iterator()

inst/include/armadillo_bits/SpMat_bones.hpp

@@ -401,12 +401,6 @@ class SpMat : public SpBase< eT, SpMat<eT> >
   arma_cold inline bool load(const csv_name&     spec, const file_type type =   csv_ascii);
   arma_cold inline bool load(      std::istream& is,   const file_type type = arma_binary);
 
-  [[deprecated("use save() instead")]] inline bool quiet_save(const std::string   name, const file_type type = arma_binary) const;
-  [[deprecated("use save() instead")]] inline bool quiet_save(      std::ostream& os,   const file_type type = arma_binary) const;
-  
-  [[deprecated("use load() instead")]] inline bool quiet_load(const std::string   name, const file_type type = arma_binary);
-  [[deprecated("use load() instead")]] inline bool quiet_load(      std::istream& is,   const file_type type = arma_binary);
-  
 
 
   // necessary forward declarations

inst/include/armadillo_bits/SpMat_meat.hpp

@@ -5000,54 +5000,6 @@ SpMat<eT>::load(std::istream& is, const file_type type)
 
 
 
-template<typename eT>
-inline
-bool
-SpMat<eT>::quiet_save(const std::string name, const file_type type) const
-  {
-  arma_debug_sigprint();
-  
-  return (*this).save(name, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-SpMat<eT>::quiet_save(std::ostream& os, const file_type type) const
-  {
-  arma_debug_sigprint();
-  
-  return (*this).save(os, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-SpMat<eT>::quiet_load(const std::string name, const file_type type)
-  {
-  arma_debug_sigprint();
-  
-  return (*this).load(name, type);
-  }
-
-
-
-template<typename eT>
-inline
-bool
-SpMat<eT>::quiet_load(std::istream& is, const file_type type)
-  {
-  arma_debug_sigprint();
-  
-  return (*this).load(is, type);
-  }
-
-
-
 /**
  * Initialize the matrix to the specified size.  Data is not preserved, so the matrix is assumed to be entirely sparse (empty).
  */