[Rcpp-commits] r3026 - pkg/RcppArmadillo/inst/include/armadillo_bits
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Tue May 17 03:12:15 CEST 2011
Author: edd
Date: 2011-05-17 03:12:13 +0200 (Tue, 17 May 2011)
New Revision: 3026
Removed:
pkg/RcppArmadillo/inst/include/armadillo_bits/Cube_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/GlueCube_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/Glue_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/OpCube_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/Op_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/Row_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/arma_ostream_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/arrayops_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/atlas_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/auxlib_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/blas_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/diagview_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/diskio_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/eGlueCube_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/eGlue_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/eOpCube_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/eOp_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/eglue_core_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/eop_core_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/field_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/fn_htrans.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/forward_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/glue_conv_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/glue_cor_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/glue_cov_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/glue_cross_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/glue_join_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/glue_kron_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/glue_mixed_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/glue_relational_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/glue_solve_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/glue_times_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/glue_toeplitz_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/injector_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/lapack_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/mtGlueCube_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/mtGlue_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/mtOpCube_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/mtOp_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_chol_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_cor_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_cov_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_cumsum_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_cx_scalar_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_diagmat_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_diagvec_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_dot_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_dotext_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_find_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_flip_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_htrans_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_inv_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_max_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_mean_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_median_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_min_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_misc_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_pinv_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_princomp_cov_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_princomp_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_prod_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_relational_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_repmat_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_reshape_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_shuffle_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_sort_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_stddev_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_sum_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_trans_meat.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_trans_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_trimat_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/op_var_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/podarray_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/running_stat_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/running_stat_vec_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/subview_cube_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/subview_elem1_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/subview_field_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/subview_proto.hpp
pkg/RcppArmadillo/inst/include/armadillo_bits/wall_clock_proto.hpp
Log:
commit one of Armadillo 1.99.1: removed files
Deleted: pkg/RcppArmadillo/inst/include/armadillo_bits/Cube_proto.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/Cube_proto.hpp 2011-05-15 01:16:05 UTC (rev 3025)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/Cube_proto.hpp 2011-05-17 01:12:13 UTC (rev 3026)
@@ -1,356 +0,0 @@
-// Copyright (C) 2008-2011 NICTA (www.nicta.com.au)
-// Copyright (C) 2008-2011 Conrad Sanderson
-//
-// This file is part of the Armadillo C++ library.
-// It is provided without any warranty of fitness
-// for any purpose. You can redistribute this file
-// and/or modify it under the terms of the GNU
-// Lesser General Public License (LGPL) as published
-// by the Free Software Foundation, either version 3
-// of the License or (at your option) any later version.
-// (see http://www.opensource.org/licenses for more info)
-
-
-//! \addtogroup Cube
-//! @{
-
-
-
-struct Cube_prealloc
- {
- static const u32 mat_ptrs_size = 4;
- static const u32 mem_n_elem = 64;
- };
-
-
-
-//! Dense cube class
-
-template<typename eT>
-class Cube : public BaseCube< eT, Cube<eT> >
- {
- public:
-
- typedef eT elem_type; //!< the type of elements stored in the cube
- typedef typename get_pod_type<eT>::result pod_type; //!< if eT is non-complex, pod_type is same as eT. otherwise, pod_type is the underlying type used by std::complex
-
- const u32 n_rows; //!< number of rows in each slice (read-only)
- const u32 n_cols; //!< number of columns in each slice (read-only)
- const u32 n_elem_slice; //!< number of elements in each slice (read-only)
- const u32 n_slices; //!< number of slices in the cube (read-only)
- const u32 n_elem; //!< number of elements in the cube (read-only)
- const u32 mem_state;
-
- // mem_state = 0: normal cube that can be resized;
- // mem_state = 1: use auxiliary memory until change in the number of elements is requested;
- // mem_state = 2: use auxiliary memory and don't allow the number of elements to be changed;
- // mem_state = 3: fixed size (e.g. via template based size specification).
-
-
- arma_aligned const Mat<eT>** const mat_ptrs; //!< pointer to an array containing pointers to Mat instances (one for each slice)
- arma_aligned const eT* const mem; //!< pointer to the memory used by the cube (memory is read-only)
-
- protected:
- arma_aligned Mat<eT>* mat_ptrs_local[ Cube_prealloc::mat_ptrs_size ];
- arma_aligned eT mem_local[ Cube_prealloc::mem_n_elem ];
-
-
- public:
-
- inline ~Cube();
- inline Cube();
-
- inline Cube(const u32 in_rows, const u32 in_cols, const u32 in_slices);
-
- inline Cube( eT* aux_mem, const u32 aux_n_rows, const u32 aux_n_cols, const u32 aux_n_slices, const bool copy_aux_mem = true, const bool strict = true);
- inline Cube(const eT* aux_mem, const u32 aux_n_rows, const u32 aux_n_cols, const u32 aux_n_slices);
-
- arma_inline const Cube& operator=(const eT val);
- arma_inline const Cube& operator+=(const eT val);
- arma_inline const Cube& operator-=(const eT val);
- arma_inline const Cube& operator*=(const eT val);
- arma_inline const Cube& operator/=(const eT val);
-
- inline Cube(const Cube& m);
- inline const Cube& operator=(const Cube& m);
- inline const Cube& operator+=(const Cube& m);
- inline const Cube& operator-=(const Cube& m);
- inline const Cube& operator%=(const Cube& m);
- inline const Cube& operator/=(const Cube& m);
-
- template<typename T1, typename T2>
- inline explicit Cube(const BaseCube<pod_type,T1>& A, const BaseCube<pod_type,T2>& B);
-
- inline Cube(const subview_cube<eT>& X);
- inline const Cube& operator=(const subview_cube<eT>& X);
- inline const Cube& operator+=(const subview_cube<eT>& X);
- inline const Cube& operator-=(const subview_cube<eT>& X);
- inline const Cube& operator%=(const subview_cube<eT>& X);
- inline const Cube& operator/=(const subview_cube<eT>& X);
-
- arma_inline Mat<eT>& slice(const u32 in_slice);
- arma_inline const Mat<eT>& slice(const u32 in_slice) const;
-
- arma_inline subview_cube<eT> slices(const u32 in_slice1, const u32 in_slice2);
- arma_inline const subview_cube<eT> slices(const u32 in_slice1, const u32 in_slice2) const;
-
- arma_inline subview_cube<eT> subcube(const u32 in_row1, const u32 in_col1, const u32 in_slice1, const u32 in_row2, const u32 in_col2, const u32 in_slice2);
- arma_inline const subview_cube<eT> subcube(const u32 in_row1, const u32 in_col1, const u32 in_slice1, const u32 in_row2, const u32 in_col2, const u32 in_slice2) const;
-
- inline subview_cube<eT> subcube(const span& row_span, const span& col_span, const span& slice_span);
- inline const subview_cube<eT> subcube(const span& row_span, const span& col_span, const span& slice_span) const;
-
- inline subview_cube<eT> operator()(const span& row_span, const span& col_span, const span& slice_span);
- inline const subview_cube<eT> operator()(const span& row_span, const span& col_span, const span& slice_span) const;
-
-
- inline void shed_slice(const u32 slice_num);
-
- inline void shed_slices(const u32 in_slice1, const u32 in_slice2);
-
- inline void insert_slices(const u32 slice_num, const u32 N, const bool set_to_zero = true);
-
- template<typename T1>
- inline void insert_slices(const u32 row_num, const BaseCube<eT,T1>& X);
-
-
- template<typename T1, typename op_type> inline Cube(const OpCube<T1, op_type>& X);
- template<typename T1, typename op_type> inline const Cube& operator=(const OpCube<T1, op_type>& X);
- template<typename T1, typename op_type> inline const Cube& operator+=(const OpCube<T1, op_type>& X);
- template<typename T1, typename op_type> inline const Cube& operator-=(const OpCube<T1, op_type>& X);
- template<typename T1, typename op_type> inline const Cube& operator%=(const OpCube<T1, op_type>& X);
- template<typename T1, typename op_type> inline const Cube& operator/=(const OpCube<T1, op_type>& X);
-
- template<typename T1, typename eop_type> inline Cube(const eOpCube<T1, eop_type>& X);
- template<typename T1, typename eop_type> inline const Cube& operator=(const eOpCube<T1, eop_type>& X);
- template<typename T1, typename eop_type> inline const Cube& operator+=(const eOpCube<T1, eop_type>& X);
- template<typename T1, typename eop_type> inline const Cube& operator-=(const eOpCube<T1, eop_type>& X);
- template<typename T1, typename eop_type> inline const Cube& operator%=(const eOpCube<T1, eop_type>& X);
- template<typename T1, typename eop_type> inline const Cube& operator/=(const eOpCube<T1, eop_type>& X);
-
- template<typename T1, typename op_type> inline Cube(const mtOpCube<eT, T1, op_type>& X);
- template<typename T1, typename op_type> inline const Cube& operator=(const mtOpCube<eT, T1, op_type>& X);
- template<typename T1, typename op_type> inline const Cube& operator+=(const mtOpCube<eT, T1, op_type>& X);
- template<typename T1, typename op_type> inline const Cube& operator-=(const mtOpCube<eT, T1, op_type>& X);
- template<typename T1, typename op_type> inline const Cube& operator%=(const mtOpCube<eT, T1, op_type>& X);
- template<typename T1, typename op_type> inline const Cube& operator/=(const mtOpCube<eT, T1, op_type>& X);
-
- template<typename T1, typename T2, typename glue_type> inline Cube(const GlueCube<T1, T2, glue_type>& X);
- template<typename T1, typename T2, typename glue_type> inline const Cube& operator=(const GlueCube<T1, T2, glue_type>& X);
- template<typename T1, typename T2, typename glue_type> inline const Cube& operator+=(const GlueCube<T1, T2, glue_type>& X);
- template<typename T1, typename T2, typename glue_type> inline const Cube& operator-=(const GlueCube<T1, T2, glue_type>& X);
- template<typename T1, typename T2, typename glue_type> inline const Cube& operator%=(const GlueCube<T1, T2, glue_type>& X);
- template<typename T1, typename T2, typename glue_type> inline const Cube& operator/=(const GlueCube<T1, T2, glue_type>& X);
-
- template<typename T1, typename T2, typename eglue_type> inline Cube(const eGlueCube<T1, T2, eglue_type>& X);
- template<typename T1, typename T2, typename eglue_type> inline const Cube& operator=(const eGlueCube<T1, T2, eglue_type>& X);
- template<typename T1, typename T2, typename eglue_type> inline const Cube& operator+=(const eGlueCube<T1, T2, eglue_type>& X);
- template<typename T1, typename T2, typename eglue_type> inline const Cube& operator-=(const eGlueCube<T1, T2, eglue_type>& X);
- template<typename T1, typename T2, typename eglue_type> inline const Cube& operator%=(const eGlueCube<T1, T2, eglue_type>& X);
- template<typename T1, typename T2, typename eglue_type> inline const Cube& operator/=(const eGlueCube<T1, T2, eglue_type>& X);
-
- template<typename T1, typename T2, typename glue_type> inline Cube(const mtGlueCube<eT, T1, T2, glue_type>& X);
- template<typename T1, typename T2, typename glue_type> inline const Cube& operator=(const mtGlueCube<eT, T1, T2, glue_type>& X);
- template<typename T1, typename T2, typename glue_type> inline const Cube& operator+=(const mtGlueCube<eT, T1, T2, glue_type>& X);
- template<typename T1, typename T2, typename glue_type> inline const Cube& operator-=(const mtGlueCube<eT, T1, T2, glue_type>& X);
- template<typename T1, typename T2, typename glue_type> inline const Cube& operator%=(const mtGlueCube<eT, T1, T2, glue_type>& X);
- template<typename T1, typename T2, typename glue_type> inline const Cube& operator/=(const mtGlueCube<eT, T1, T2, glue_type>& X);
-
-
- arma_inline arma_warn_unused eT& operator[] (const u32 i);
- arma_inline arma_warn_unused eT operator[] (const u32 i) const;
-
- arma_inline arma_warn_unused eT& at(const u32 i);
- arma_inline arma_warn_unused eT at(const u32 i) const;
-
- arma_inline arma_warn_unused eT& operator() (const u32 i);
- arma_inline arma_warn_unused eT operator() (const u32 i) const;
-
- arma_inline arma_warn_unused eT& at (const u32 in_row, const u32 in_col, const u32 in_slice);
- arma_inline arma_warn_unused eT at (const u32 in_row, const u32 in_col, const u32 in_slice) const;
-
- arma_inline arma_warn_unused eT& operator() (const u32 in_row, const u32 in_col, const u32 in_slice);
- arma_inline arma_warn_unused eT operator() (const u32 in_row, const u32 in_col, const u32 in_slice) const;
-
- arma_inline const Cube& operator++();
- arma_inline void operator++(int);
-
- arma_inline const Cube& operator--();
- arma_inline void operator--(int);
-
- arma_inline arma_warn_unused bool is_finite() const;
- arma_inline arma_warn_unused bool is_empty() const;
-
- arma_inline arma_warn_unused bool in_range(const u32 i) const;
- arma_inline arma_warn_unused bool in_range(const span& x) const;
-
- arma_inline arma_warn_unused bool in_range(const u32 in_row, const u32 in_col, const u32 in_slice) const;
- inline arma_warn_unused bool in_range(const span& row_span, const span& col_span, const span& slice_span) const;
-
- arma_inline arma_warn_unused eT* memptr();
- arma_inline arma_warn_unused const eT* memptr() const;
-
- arma_inline arma_warn_unused eT* slice_memptr(const u32 slice);
- arma_inline arma_warn_unused const eT* slice_memptr(const u32 slice) const;
-
- arma_inline arma_warn_unused eT* slice_colptr(const u32 in_slice, const u32 in_col);
- arma_inline arma_warn_unused const eT* slice_colptr(const u32 in_slice, const u32 in_col) const;
-
- inline void print(const std::string extra_text = "") const;
- inline void print(std::ostream& user_stream, const std::string extra_text = "") const;
-
- inline void raw_print(const std::string extra_text = "") const;
- inline void raw_print(std::ostream& user_stream, const std::string extra_text = "") const;
-
- inline void set_size(const u32 in_rows, const u32 in_cols, const u32 in_slices);
- inline void reshape(const u32 in_rows, const u32 in_cols, const u32 in_slices, const u32 dim = 0);
-
- template<typename eT2> inline void copy_size(const Cube<eT2>& m);
-
- inline const Cube& fill(const eT val);
-
- inline const Cube& zeros();
- inline const Cube& zeros(const u32 in_rows, const u32 in_cols, const u32 in_slices);
-
- inline const Cube& ones();
- inline const Cube& ones(const u32 in_rows, const u32 in_cols, const u32 in_slices);
-
- inline const Cube& randu();
- inline const Cube& randu(const u32 in_rows, const u32 in_cols, const u32 in_slices);
-
- inline const Cube& randn();
- inline const Cube& randn(const u32 in_rows, const u32 in_cols, const u32 in_slices);
-
- inline void reset();
-
-
- template<typename T1> inline void set_real(const BaseCube<pod_type,T1>& X);
- template<typename T1> inline void set_imag(const BaseCube<pod_type,T1>& X);
-
-
- inline arma_warn_unused eT min() const;
- inline arma_warn_unused eT max() const;
-
- inline eT min(u32& index_of_min_val) const;
- inline eT max(u32& index_of_max_val) const;
-
- inline eT min(u32& row_of_min_val, u32& col_of_min_val, u32& slice_of_min_val) const;
- inline eT max(u32& row_of_max_val, u32& col_of_max_val, u32& slice_of_max_val) const;
-
-
- inline bool save(const std::string name, const file_type type = arma_binary, const bool print_status = true) const;
- inline bool save( std::ostream& os, const file_type type = arma_binary, const bool print_status = true) const;
-
- inline bool load(const std::string name, const file_type type = auto_detect, const bool print_status = true);
- inline bool load( std::istream& is, const file_type type = auto_detect, const bool print_status = true);
-
- inline bool quiet_save(const std::string name, const file_type type = arma_binary) const;
- inline bool quiet_save( std::ostream& os, const file_type type = arma_binary) const;
-
- inline bool quiet_load(const std::string name, const file_type type = auto_detect);
- inline bool quiet_load( std::istream& is, const file_type type = auto_detect);
-
-
- // iterators
-
- typedef eT* iterator;
- typedef const eT* const_iterator;
-
- typedef eT* slice_iterator;
- typedef const eT* const_slice_iterator;
-
- inline iterator begin();
- inline const_iterator begin() const;
-
- inline iterator end();
- inline const_iterator end() const;
-
- inline slice_iterator begin_slice(const u32 slice_num);
- inline const_slice_iterator begin_slice(const u32 slice_num) const;
-
- inline slice_iterator end_slice(const u32 slice_num);
- inline const_slice_iterator end_slice(const u32 slice_num) const;
-
-
- template<u32 fixed_n_rows, u32 fixed_n_cols, u32 fixed_n_slices>
- class fixed : public Cube<eT>
- {
- private:
-
- static const u32 fixed_n_elem = fixed_n_rows * fixed_n_cols * fixed_n_slices;
-
- arma_aligned Mat<eT>* mat_ptrs_local_extra[ (fixed_n_slices > Cube_prealloc::mat_ptrs_size) ? fixed_n_slices : 1 ];
- arma_aligned eT mem_local_extra [ (fixed_n_elem > Cube_prealloc::mem_n_elem) ? fixed_n_elem : 1 ];
-
- arma_inline void mem_setup();
-
-
- public:
-
- inline fixed() { mem_setup(); }
-
- inline const Cube& operator=(const eT val) { mem_setup(); Cube<eT>::operator=(val); return *this; }
-
- template<typename T1>
- inline fixed(const BaseCube<eT,T1>& A) { mem_setup(); Cube<eT>::operator=(A.get_ref()); }
-
- template<typename T1>
- inline const Cube& operator=(const BaseCube<eT,T1>& A) { Cube<eT>::operator=(A.get_ref()); return *this; }
-
- template<typename T1, typename T2>
- inline explicit fixed(const BaseCube<pod_type,T1>& A, const BaseCube<pod_type,T2>& B) { mem_setup(); Cube<eT>::init(A,B); }
- };
-
-
- protected:
-
- inline void init(const u32 in_rows, const u32 in_cols, const u32 in_slices);
- inline void init(const Cube& x);
-
- template<typename T1, typename T2>
- inline void init(const BaseCube<pod_type,T1>& A, const BaseCube<pod_type,T2>& B);
-
- inline void steal_mem(Cube& X);
-
- inline void delete_mat();
- inline void create_mat();
-
- friend class op_reshape;
- friend class glue_join;
-
-
- public:
-
- #ifdef ARMA_EXTRA_CUBE_PROTO
- #include ARMA_INCFILE_WRAP(ARMA_EXTRA_CUBE_PROTO)
- #endif
- };
-
-
-
-class Cube_aux
- {
- public:
-
- template<typename eT> arma_inline static void prefix_pp(Cube<eT>& x);
- template<typename T> arma_inline static void prefix_pp(Cube< std::complex<T> >& x);
-
- template<typename eT> arma_inline static void postfix_pp(Cube<eT>& x);
- template<typename T> arma_inline static void postfix_pp(Cube< std::complex<T> >& x);
-
- template<typename eT> arma_inline static void prefix_mm(Cube<eT>& x);
- template<typename T> arma_inline static void prefix_mm(Cube< std::complex<T> >& x);
-
- template<typename eT> arma_inline static void postfix_mm(Cube<eT>& x);
- template<typename T> arma_inline static void postfix_mm(Cube< std::complex<T> >& x);
-
- template<typename eT, typename T1> inline static void set_real(Cube<eT>& out, const BaseCube<eT,T1>& X);
- template<typename eT, typename T1> inline static void set_imag(Cube<eT>& out, const BaseCube<eT,T1>& X);
-
- template<typename T, typename T1> inline static void set_real(Cube< std::complex<T> >& out, const BaseCube< T,T1>& X);
- template<typename T, typename T1> inline static void set_imag(Cube< std::complex<T> >& out, const BaseCube< T,T1>& X);
- };
-
-
-
-//! @}
Deleted: pkg/RcppArmadillo/inst/include/armadillo_bits/GlueCube_proto.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/GlueCube_proto.hpp 2011-05-15 01:16:05 UTC (rev 3025)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/GlueCube_proto.hpp 2011-05-17 01:12:13 UTC (rev 3026)
@@ -1,38 +0,0 @@
-// Copyright (C) 2008-2010 NICTA (www.nicta.com.au)
-// Copyright (C) 2008-2010 Conrad Sanderson
-//
-// This file is part of the Armadillo C++ library.
-// It is provided without any warranty of fitness
-// for any purpose. You can redistribute this file
-// and/or modify it under the terms of the GNU
-// Lesser General Public License (LGPL) as published
-// by the Free Software Foundation, either version 3
-// of the License or (at your option) any later version.
-// (see http://www.opensource.org/licenses for more info)
-
-
-//! \addtogroup GlueCube
-//! @{
-
-
-
-//! analog of the Glue class, intended for Cube objects
-template<typename T1, typename T2, typename glue_type>
-class GlueCube : public BaseCube<typename T1::elem_type, GlueCube<T1, T2, glue_type> >
- {
- public:
-
- typedef typename T1::elem_type elem_type;
- typedef typename get_pod_type<elem_type>::result pod_type;
-
- arma_inline GlueCube(const BaseCube<typename T1::elem_type, T1>& in_A, const BaseCube<typename T1::elem_type, T2>& in_B);
- arma_inline ~GlueCube();
-
- const T1& A; //!< first operand
- const T2& B; //!< second operand
-
- };
-
-
-
-//! @}
Deleted: pkg/RcppArmadillo/inst/include/armadillo_bits/Glue_proto.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/Glue_proto.hpp 2011-05-15 01:16:05 UTC (rev 3025)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/Glue_proto.hpp 2011-05-17 01:12:13 UTC (rev 3026)
@@ -1,51 +0,0 @@
-// Copyright (C) 2008-2010 NICTA (www.nicta.com.au)
-// Copyright (C) 2008-2010 Conrad Sanderson
-//
-// This file is part of the Armadillo C++ library.
-// It is provided without any warranty of fitness
-// for any purpose. You can redistribute this file
-// and/or modify it under the terms of the GNU
-// Lesser General Public License (LGPL) as published
-// by the Free Software Foundation, either version 3
-// of the License or (at your option) any later version.
-// (see http://www.opensource.org/licenses for more info)
-
-
-//! \addtogroup Glue
-//! @{
-
-
-
-//! Class for storing data required for delayed binary operations,
-//! such as the operands (e.g. two matrices) and the binary operator (e.g. addition).
-//! The operands are stored as references (which can be optimised away),
-//! while the operator is "stored" through the template definition (glue_type).
-//! The operands can be 'Mat', 'Row', 'Col', 'Op', and 'Glue'.
-//! Note that as 'Glue' can be one of the operands, more than two matrices can be stored.
-//!
-//! For example, we could have: Glue<Mat, Mat, glue_times>
-//!
-//! Another example is: Glue< Op<Mat, op_trans>, Op<Mat, op_inv>, glue_times >
-
-
-
-template<typename T1, typename T2, typename glue_type>
-class Glue : public Base<typename T1::elem_type, Glue<T1, T2, glue_type> >
- {
- public:
-
- typedef typename T1::elem_type elem_type;
- typedef typename get_pod_type<elem_type>::result pod_type;
-
- arma_inline Glue(const T1& in_A, const T2& in_B);
- arma_inline Glue(const T1& in_A, const T2& in_B, const u32 in_aux_u32);
- arma_inline ~Glue();
-
- const T1& A; //!< first operand
- const T2& B; //!< second operand
- const u32 aux_u32; //!< storage of auxiliary data, u32 format
- };
-
-
-
-//! @}
Deleted: pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_proto.hpp
===================================================================
--- pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_proto.hpp 2011-05-15 01:16:05 UTC (rev 3025)
+++ pkg/RcppArmadillo/inst/include/armadillo_bits/Mat_proto.hpp 2011-05-17 01:12:13 UTC (rev 3026)
@@ -1,514 +0,0 @@
-// Copyright (C) 2008-2011 NICTA (www.nicta.com.au)
-// Copyright (C) 2008-2011 Conrad Sanderson
-//
-// This file is part of the Armadillo C++ library.
-// It is provided without any warranty of fitness
-// for any purpose. You can redistribute this file
-// and/or modify it under the terms of the GNU
-// Lesser General Public License (LGPL) as published
-// by the Free Software Foundation, either version 3
-// of the License or (at your option) any later version.
-// (see http://www.opensource.org/licenses for more info)
-
-
-//! \addtogroup Mat
-//! @{
-
-
-
-//! Dense matrix class
-
-template<typename eT>
-class Mat : public Base< eT, Mat<eT> >
- {
- public:
-
- typedef eT elem_type; //!< the type of elements stored in the matrix
- typedef typename get_pod_type<eT>::result pod_type; //!< if eT is non-complex, pod_type is same as eT. otherwise, pod_type is the underlying type used by std::complex
-
- const u32 n_rows; //!< number of rows in the matrix (read-only)
- const u32 n_cols; //!< number of columns in the matrix (read-only)
- const u32 n_elem; //!< number of elements in the matrix (read-only)
- const u16 vec_state; //!< 0: matrix layout; 1: column vector layout; 2: row vector layout
- const u16 mem_state;
-
- // mem_state = 0: normal matrix that can be resized;
- // mem_state = 1: use auxiliary memory until change in the number of elements is requested;
- // mem_state = 2: use auxiliary memory and don't allow the number of elements to be changed;
- // mem_state = 3: fixed size (e.g. via template based size specification).
-
- arma_aligned const eT* const mem; //!< pointer to the memory used by the matrix (memory is read-only)
-
- protected:
- arma_aligned eT mem_local[ arma_config::mat_prealloc ];
-
-
- public:
-
- inline ~Mat();
- inline Mat();
-
- inline Mat(const u32 in_rows, const u32 in_cols);
-
- inline Mat(const char* text);
- inline const Mat& operator=(const char* text);
- inline Mat(const std::string& text);
- inline const Mat& operator=(const std::string& text);
-
- inline Mat( eT* aux_mem, const u32 aux_n_rows, const u32 aux_n_cols, const bool copy_aux_mem = true, const bool strict = true);
- inline Mat(const eT* aux_mem, const u32 aux_n_rows, const u32 aux_n_cols);
-
- arma_inline const Mat& operator=(const eT val);
- arma_inline const Mat& operator+=(const eT val);
- arma_inline const Mat& operator-=(const eT val);
- arma_inline const Mat& operator*=(const eT val);
- arma_inline const Mat& operator/=(const eT val);
-
- inline Mat(const Mat& m);
- inline const Mat& operator=(const Mat& m);
- inline const Mat& operator+=(const Mat& m);
- inline const Mat& operator-=(const Mat& m);
- inline const Mat& operator*=(const Mat& m);
- inline const Mat& operator%=(const Mat& m);
- inline const Mat& operator/=(const Mat& m);
-
- template<typename T1> inline Mat(const BaseCube<eT,T1>& X);
- template<typename T1> inline const Mat& operator=(const BaseCube<eT,T1>& X);
- template<typename T1> inline const Mat& operator+=(const BaseCube<eT,T1>& X);
- template<typename T1> inline const Mat& operator-=(const BaseCube<eT,T1>& X);
- template<typename T1> inline const Mat& operator*=(const BaseCube<eT,T1>& X);
- template<typename T1> inline const Mat& operator%=(const BaseCube<eT,T1>& X);
- template<typename T1> inline const Mat& operator/=(const BaseCube<eT,T1>& X);
-
- template<typename T1, typename T2>
- inline explicit Mat(const Base<pod_type,T1>& A, const Base<pod_type,T2>& B);
-
- inline Mat(const subview<eT>& X);
- inline const Mat& operator=(const subview<eT>& X);
- inline const Mat& operator+=(const subview<eT>& X);
- inline const Mat& operator-=(const subview<eT>& X);
- inline const Mat& operator*=(const subview<eT>& X);
- inline const Mat& operator%=(const subview<eT>& X);
- inline const Mat& operator/=(const subview<eT>& X);
-
- //inline explicit Mat(const subview_cube<eT>& X);
- inline Mat(const subview_cube<eT>& X);
- inline const Mat& operator=(const subview_cube<eT>& X);
- inline const Mat& operator+=(const subview_cube<eT>& X);
- inline const Mat& operator-=(const subview_cube<eT>& X);
- inline const Mat& operator*=(const subview_cube<eT>& X);
- inline const Mat& operator%=(const subview_cube<eT>& X);
- inline const Mat& operator/=(const subview_cube<eT>& X);
-
- //inline explicit Mat(const diagview<eT>& X);
- inline Mat(const diagview<eT>& X);
- inline const Mat& operator=(const diagview<eT>& X);
- inline const Mat& operator+=(const diagview<eT>& X);
- inline const Mat& operator-=(const diagview<eT>& X);
- inline const Mat& operator*=(const diagview<eT>& X);
- inline const Mat& operator%=(const diagview<eT>& X);
- inline const Mat& operator/=(const diagview<eT>& X);
-
- template<typename T1> inline Mat(const subview_elem1<eT,T1>& X);
- template<typename T1> inline const Mat& operator= (const subview_elem1<eT,T1>& X);
- template<typename T1> inline const Mat& operator+=(const subview_elem1<eT,T1>& X);
- template<typename T1> inline const Mat& operator-=(const subview_elem1<eT,T1>& X);
- template<typename T1> inline const Mat& operator*=(const subview_elem1<eT,T1>& X);
- template<typename T1> inline const Mat& operator%=(const subview_elem1<eT,T1>& X);
- template<typename T1> inline const Mat& operator/=(const subview_elem1<eT,T1>& X);
-
-
- inline mat_injector<Mat> operator<<(const eT val);
- inline mat_injector<Mat> operator<<(const injector_end_of_row& x);
-
-
- arma_inline subview_row<eT> row(const u32 row_num);
- arma_inline const subview_row<eT> row(const u32 row_num) const;
-
- inline subview_row<eT> operator()(const u32 row_num, const span& col_span);
- inline const subview_row<eT> operator()(const u32 row_num, const span& col_span) const;
-
-
- arma_inline subview_col<eT> col(const u32 col_num);
- arma_inline const subview_col<eT> col(const u32 col_num) const;
-
- inline subview_col<eT> operator()(const span& row_span, const u32 col_num);
- inline const subview_col<eT> operator()(const span& row_span, const u32 col_num) const;
-
- inline Col<eT> unsafe_col(const u32 col_num);
- inline const Col<eT> unsafe_col(const u32 col_num) const;
-
-
- arma_inline subview<eT> rows(const u32 in_row1, const u32 in_row2);
- arma_inline const subview<eT> rows(const u32 in_row1, const u32 in_row2) const;
-
- arma_inline subview<eT> cols(const u32 in_col1, const u32 in_col2);
- arma_inline const subview<eT> cols(const u32 in_col1, const u32 in_col2) const;
-
- arma_inline subview<eT> submat(const u32 in_row1, const u32 in_col1, const u32 in_row2, const u32 in_col2);
- arma_inline const subview<eT> submat(const u32 in_row1, const u32 in_col1, const u32 in_row2, const u32 in_col2) const;
-
-
- inline subview<eT> submat (const span& row_span, const span& col_span);
- inline const subview<eT> submat (const span& row_span, const span& col_span) const;
-
- inline subview<eT> operator()(const span& row_span, const span& col_span);
- inline const subview<eT> operator()(const span& row_span, const span& col_span) const;
-
-
- template<typename T1> arma_inline subview_elem1<eT,T1> elem(const Base<u32,T1>& a);
- template<typename T1> arma_inline const subview_elem1<eT,T1> elem(const Base<u32,T1>& a) const;
-
- // template<typename T1, typename T2> arma_inline subview_elem2<eT,T1,T2> submat(const Base<u32,T1>& a, const Base<u32,T2>& b);
- // template<typename T1, typename T2> arma_inline const subview_elem2<eT,T1,T2> submat(const Base<u32,T1>& a, const Base<u32,T2>& b) const;
-
-
- arma_inline diagview<eT> diag(const s32 in_id = 0);
- arma_inline const diagview<eT> diag(const s32 in_id = 0) const;
-
-
- inline void swap_rows(const u32 in_row1, const u32 in_row2);
- inline void swap_cols(const u32 in_col1, const u32 in_col2);
-
- inline void shed_row(const u32 row_num);
- inline void shed_col(const u32 col_num);
-
- inline void shed_rows(const u32 in_row1, const u32 in_row2);
- inline void shed_cols(const u32 in_col1, const u32 in_col2);
-
- inline void insert_rows(const u32 row_num, const u32 N, const bool set_to_zero = true);
- inline void insert_cols(const u32 col_num, const u32 N, const bool set_to_zero = true);
-
- template<typename T1> inline void insert_rows(const u32 row_num, const Base<eT,T1>& X);
- template<typename T1> inline void insert_cols(const u32 col_num, const Base<eT,T1>& X);
-
-
- template<typename T1, typename op_type> inline Mat(const Op<T1, op_type>& X);
- template<typename T1, typename op_type> inline const Mat& operator=(const Op<T1, op_type>& X);
- template<typename T1, typename op_type> inline const Mat& operator+=(const Op<T1, op_type>& X);
- template<typename T1, typename op_type> inline const Mat& operator-=(const Op<T1, op_type>& X);
- template<typename T1, typename op_type> inline const Mat& operator*=(const Op<T1, op_type>& X);
- template<typename T1, typename op_type> inline const Mat& operator%=(const Op<T1, op_type>& X);
- template<typename T1, typename op_type> inline const Mat& operator/=(const Op<T1, op_type>& X);
-
- template<typename T1, typename eop_type> inline Mat(const eOp<T1, eop_type>& X);
- template<typename T1, typename eop_type> inline const Mat& operator=(const eOp<T1, eop_type>& X);
- template<typename T1, typename eop_type> inline const Mat& operator+=(const eOp<T1, eop_type>& X);
- template<typename T1, typename eop_type> inline const Mat& operator-=(const eOp<T1, eop_type>& X);
- template<typename T1, typename eop_type> inline const Mat& operator*=(const eOp<T1, eop_type>& X);
- template<typename T1, typename eop_type> inline const Mat& operator%=(const eOp<T1, eop_type>& X);
- template<typename T1, typename eop_type> inline const Mat& operator/=(const eOp<T1, eop_type>& X);
-
- template<typename T1, typename op_type> inline Mat(const mtOp<eT, T1, op_type>& X);
- template<typename T1, typename op_type> inline const Mat& operator=(const mtOp<eT, T1, op_type>& X);
- template<typename T1, typename op_type> inline const Mat& operator+=(const mtOp<eT, T1, op_type>& X);
- template<typename T1, typename op_type> inline const Mat& operator-=(const mtOp<eT, T1, op_type>& X);
- template<typename T1, typename op_type> inline const Mat& operator*=(const mtOp<eT, T1, op_type>& X);
- template<typename T1, typename op_type> inline const Mat& operator%=(const mtOp<eT, T1, op_type>& X);
- template<typename T1, typename op_type> inline const Mat& operator/=(const mtOp<eT, T1, op_type>& X);
-
- template<typename T1, typename T2, typename glue_type> inline Mat(const Glue<T1, T2, glue_type>& X);
- template<typename T1, typename T2, typename glue_type> inline const Mat& operator=(const Glue<T1, T2, glue_type>& X);
- template<typename T1, typename T2, typename glue_type> inline const Mat& operator+=(const Glue<T1, T2, glue_type>& X);
- template<typename T1, typename T2, typename glue_type> inline const Mat& operator-=(const Glue<T1, T2, glue_type>& X);
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/rcpp -r 3026
More information about the Rcpp-commits
mailing list