[Rcpp-commits] r3336 - pkg/RcppEigen/vignettes
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Sat Nov 12 23:17:27 CET 2011
Author: edd
Date: 2011-11-12 23:17:27 +0100 (Sat, 12 Nov 2011)
New Revision: 3336
Modified:
pkg/RcppEigen/vignettes/RcppEigen-intro-jss.tex
Log:
captions below, without \bf, \it, ... and ending with dot (cf http://www.jstatsoft.org/style/)
Modified: pkg/RcppEigen/vignettes/RcppEigen-intro-jss.tex
===================================================================
--- pkg/RcppEigen/vignettes/RcppEigen-intro-jss.tex 2011-11-12 22:13:10 UTC (rev 3335)
+++ pkg/RcppEigen/vignettes/RcppEigen-intro-jss.tex 2011-11-12 22:17:27 UTC (rev 3336)
@@ -174,8 +174,6 @@
vectors, as shown in Table~\ref{tab:REigen}, and this paper will use these
\code{typedef}s.
\begin{table}[tb]
- \caption{Correspondence between R matrix and vector types and classes in the \pkg{Eigen} namespace.}
- \label{tab:REigen}
\centering
\begin{tabular}{l l}
\toprule
@@ -190,6 +188,8 @@
\code{Matrix::dgCMatrix} \phantom{XXX} & \code{SparseMatrix<double>}\\
\bottomrule
\end{tabular}
+ \caption{Correspondence between R matrix and vector types and classes in the \pkg{Eigen} namespace.}
+ \label{tab:REigen}
\end{table}
Here, \code{Vector} and \code{Matrix} describe the dimension of the
@@ -358,7 +358,7 @@
\hlstd{}\hlkwa{return\ }\hlstd{}\hlkwd{wrap}\hlstd{}\hlsym{(}\hlstd{At}\hlsym{);}\hlstd{}\hspace*{\fill}
\normalfont
%\end{quote}
- \caption{\textbf{transCpp}: Transpose a matrix of integers}
+ \caption{\code{transCpp}: Transpose a matrix of integers.}
\label{trans}
\end{figure}
@@ -411,7 +411,7 @@
\normalfont
\normalsize
%\end{quote}
- \caption{\textbf{prodCpp}: Product and cross-product of two matrices}
+ \caption{\code{prodCpp}: Product and cross-product of two matrices.}
\label{prod}
\end{figure}
@@ -485,7 +485,7 @@
\normalfont
\normalsize
%\end{quote}
- \caption{\textbf{crossprodCpp}: Cross-product and transposed cross-product of a single matrix}
+ \caption{\code{crossprodCpp}: Cross-product and transposed cross-product of a single matrix.}
\label{crossprod}
\end{figure}
\begin{verbatim}
@@ -575,7 +575,7 @@
\normalfont
\normalsize
%\end{quote}
- \caption{\textbf{cholCpp}: Cholesky decomposition of a cross-product}
+ \caption{\code{cholCpp}: Cholesky decomposition of a cross-product.}
\label{chol}
\end{figure}
@@ -635,8 +635,8 @@
\normalfont
\normalsize
%\end{quote}
- \caption{\textbf{cholDetCpp}: Determinant of a cross-product using
- the ``LLt'' and ``LDLt'' forms of the Cholesky decomposition}
+ \caption{\code{cholDetCpp}: Determinant of a cross-product using
+ the ``LLt'' and ``LDLt'' forms of the Cholesky decomposition.}
\label{cholDet}
\end{figure}
@@ -706,7 +706,7 @@
\normalfont
\normalsize
%\end{quote}
- \caption{\textbf{lltLSCpp}: Least squares using the Cholesky decomposition}
+ \caption{\code{lltLSCpp}: Least squares using the Cholesky decomposition.}
\label{lltLS}
\end{figure}
Figure~\ref{lltLS} shows a calculation of the least squares coefficient estimates
@@ -826,7 +826,7 @@
\mbox{}
\normalfont
\normalsize
- \caption{\textbf{QRLSCpp}: Least squares using the unpivoted QR decomposition}
+ \caption{\code{QRLSCpp}: Least squares using the unpivoted QR decomposition.}
\label{QRLS}
%\end{quote}
\end{figure}
@@ -943,7 +943,7 @@
\normalfont
\normalsize
%\end{quote}
- \caption{\textbf{DplusCpp}: Create the diagonal $\bm d^+$ of the pseudo-inverse, $\bm D_1^+$, from the array of singular values, $\bm d$}
+ \caption{\code{DplusCpp}: Create the diagonal $\bm d^+$ of the pseudo-inverse, $\bm D_1^+$, from the array of singular values, $\bm d$.}
\label{Dplus}
\end{figure}
% inline ArrayXd Dplus(const ArrayXd& d) {
@@ -985,7 +985,7 @@
\normalfont
\normalsize
%\end{quote}
- \caption{\textbf{SVDLSCpp}: Least squares using the SVD}
+ \caption{\code{SVDLSCpp}: Least squares using the SVD.}
\label{SVDLS}
\end{figure}
% using Eigen::JacobiSVD;
@@ -1050,7 +1050,7 @@
\normalfont
\normalsize
%\end{quote}
- \caption{\textbf{SymmEigLSCpp}: Least squares using the eigendecomposition}
+ \caption{\code{SymmEigLSCpp}: Least squares using the eigendecomposition.}
\label{SymmEigLS}
\end{figure}
% using Eigen::SelfAdjointEigenSolver;
@@ -1138,7 +1138,7 @@
\normalfont
\normalsize
%\end{quote}
- \caption{\textbf{ColPivQRLSCpp}: Least squares using the pivoted QR decomposition}
+ \caption{\code{ColPivQRLSCpp}: Least squares using the pivoted QR decomposition.}
\label{ColPivQRLS}
\end{figure}
% typedef Eigen::ColPivHouseholderQR<MatrixXd> CPivQR;
@@ -1295,12 +1295,6 @@
Results obtained on a desktop computer, circa 2010, are shown in
Table~\ref{tab:lmRes}.
\begin{table}[tb]
- \caption{\code{lmBenchmark} results on a desktop computer for the
- default size, $100,000\times 40$, full-rank model matrix running
- 20 repetitions for each method. Times (Elapsed, User and Sys) are
- in seconds. The BLAS in use is a locally-rebuilt version of the
- OpenBLAS library included with Ubuntu 11.10).}
- \label{tab:lmRes}
\centering
\begin{tabular}{r r r r r}
\toprule
@@ -1343,6 +1337,12 @@
GSL & 150.46 & 176.95 & 210.52 & 149.86 \\
\bottomrule
\end{tabular}
+ \caption{\code{lmBenchmark} results on a desktop computer for the
+ default size, $100,000\times 40$, full-rank model matrix running
+ 20 repetitions for each method. Times (Elapsed, User and Sys) are
+ in seconds. The BLAS in use is a locally-rebuilt version of the
+ OpenBLAS library included with Ubuntu 11.10.}
+ \label{tab:lmRes}
\end{table}
The processor used for these timings is a 4-core processor but almost all the
methods are single-threaded and not affected by the number of cores.
@@ -1411,7 +1411,7 @@
\normalfont
\normalsize
%\end{quote}
- \caption{\textbf{badtransCpp}: Transpose producing incorrect results}
+ \caption{\code{badtransCpp}: Transpose producing incorrect results.}
\label{badtrans}
\end{figure}
\begin{verbatim}
@@ -1452,7 +1452,7 @@
\mbox{}
\normalfont
\normalsize
- \caption{\textbf{sparseProdCpp}: Transpose and product with sparse matrices}
+ \caption{\code{sparseProdCpp}: Transpose and product with sparse matrices.}
\label{sparseProd}
%\end{quote}
\end{figure}
@@ -1500,7 +1500,7 @@
\normalfont
\normalsize
%\end{quote}
- \caption{\textbf{sparseLSCpp}: Solving a sparse least squares problem}
+ \caption{\code{sparseLSCpp}: Solving a sparse least squares problem.}
\label{fig:spLS}
\end{figure}
More information about the Rcpp-commits
mailing list