[Rcpp-commits] r3091 - in pkg/RcppEigen: . R inst/doc inst/include inst/unitTests man src

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Wed Jun 15 22:35:02 CEST 2011


Author: dmbates
Date: 2011-06-15 22:35:02 +0200 (Wed, 15 Jun 2011)
New Revision: 3091

Modified:
   pkg/RcppEigen/DESCRIPTION
   pkg/RcppEigen/R/RcppEigen.package.skeleton.R
   pkg/RcppEigen/R/SHLIB.R
   pkg/RcppEigen/R/fastLm.R
   pkg/RcppEigen/R/inline.R
   pkg/RcppEigen/R/unit.test.R
   pkg/RcppEigen/inst/doc/RcppEigen-unitTests.Rnw
   pkg/RcppEigen/inst/include/RcppEigen.h
   pkg/RcppEigen/inst/include/RcppEigenConfig.h
   pkg/RcppEigen/inst/include/RcppEigenForward.h
   pkg/RcppEigen/inst/include/RcppEigenWrap.h
   pkg/RcppEigen/inst/unitTests/runit.fastLm.R
   pkg/RcppEigen/man/fastLm.Rd
   pkg/RcppEigen/src/RcppEigen.cpp
   pkg/RcppEigen/src/fastLm.cpp
Log:
Change references to Armadillo into Eigen; author order in copyright statements.


Modified: pkg/RcppEigen/DESCRIPTION
===================================================================
--- pkg/RcppEigen/DESCRIPTION	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/DESCRIPTION	2011-06-15 20:35:02 UTC (rev 3091)
@@ -3,7 +3,7 @@
 Title: Rcpp integration for the Eigen templated linear algebra library.
 Version: 0.1.1
 Date: 2011-06-14
-Author: Romain Francois, Dirk Eddelbuettel and Douglas Bates
+Author: Douglas Bates, Romain Francois and Dirk Eddelbuettel
 Maintainer: Romain Francois, Dirk Eddelbuettel and Douglas Bates <RcppArmadillo-authors at r-enthusiasts.com>
 Description: R and Eigen integration using Rcpp
  Eigen is a C++ linear template library for linear algebra: matrices,

Modified: pkg/RcppEigen/R/RcppEigen.package.skeleton.R
===================================================================
--- pkg/RcppEigen/R/RcppEigen.package.skeleton.R	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/R/RcppEigen.package.skeleton.R	2011-06-15 20:35:02 UTC (rev 3091)
@@ -1,6 +1,6 @@
 ## RcppEigen.package.skeleton.R: makes a skeleton for a package that wants to use RcppEigen
 ##
-## Copyright (C)  2011 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+## Copyright (C)       2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 ##
 ## This file is part of RcppEigen.
 ##
@@ -102,7 +102,7 @@
 		message( " >> added example header file using Rcpp/RcppEigen")
 		
 		file.copy( file.path( skeleton, "rcppeigen_hello_world.cpp" ), src )
-		message( " >> added example src file using armadillo classes")
+		message( " >> added example src file using Eigen classes")
 		
 		rcode <- readLines( file.path( skeleton, "rcppeigen_hello_world.R" ) )
 		rcode <- gsub( "@PKG@", name, rcode, fixed = TRUE )

Modified: pkg/RcppEigen/R/SHLIB.R
===================================================================
--- pkg/RcppEigen/R/SHLIB.R	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/R/SHLIB.R	2011-06-15 20:35:02 UTC (rev 3091)
@@ -1,19 +1,19 @@
-## Copyright (C)       2010 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+## Copyright (C)       2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 ##
-## This file is part of RcppArmadillo.
+## This file is part of RcppEigen.
 ##
-## RcppArmadillo is free software: you can redistribute it and/or modify it
+## RcppEigen is free software: you can redistribute it and/or modify it
 ## under the terms of the GNU General Public License as published by
 ## the Free Software Foundation, either version 2 of the License, or
 ## (at your option) any later version.
 ##
-## RcppArmadillo is distributed in the hope that it will be useful, but
+## RcppEigen is distributed in the hope that it will be useful, but
 ## WITHOUT ANY WARRANTY; without even the implied warranty of
 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with RcppArmadillo.  If not, see <http://www.gnu.org/licenses/>.
+## along with RcppEigen.  If not, see <http://www.gnu.org/licenses/>.
 
 SHLIB <- Rcpp:::SHLIB.maker( 
     env = list( 

Modified: pkg/RcppEigen/R/fastLm.R
===================================================================
--- pkg/RcppEigen/R/fastLm.R	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/R/fastLm.R	2011-06-15 20:35:02 UTC (rev 3091)
@@ -1,6 +1,6 @@
 ## fastLm.R: Rcpp/Eigen implementation of lm()
 ##
-## Copyright (C)  2011 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+## Copyright (C)  2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 ##
 ## This file is part of RcppEigen.
 ##

Modified: pkg/RcppEigen/R/inline.R
===================================================================
--- pkg/RcppEigen/R/inline.R	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/R/inline.R	2011-06-15 20:35:02 UTC (rev 3091)
@@ -1,4 +1,4 @@
-## Copyright (C)       2010 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+## Copyright (C)       2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 ##
 ## This file is part of RcppEigen.
 ##

Modified: pkg/RcppEigen/R/unit.test.R
===================================================================
--- pkg/RcppEigen/R/unit.test.R	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/R/unit.test.R	2011-06-15 20:35:02 UTC (rev 3091)
@@ -1,4 +1,4 @@
-# Copyright (C)        2011 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+# Copyright (C)       2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 #
 # This file is part of RcppEigen.
 #

Modified: pkg/RcppEigen/inst/doc/RcppEigen-unitTests.Rnw
===================================================================
--- pkg/RcppEigen/inst/doc/RcppEigen-unitTests.Rnw	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/inst/doc/RcppEigen-unitTests.Rnw	2011-06-15 20:35:02 UTC (rev 3091)
@@ -4,7 +4,7 @@
 \setmargrb{0.75in}{0.75in}{0.75in}{0.75in}
 
 \usepackage[colorlinks]{hyperref}
-\author{Dirk Eddelbuettel, Romain Fran\c{c}ois and Douglas Bates}
+\author{Douglas Bates, Dirk Eddelbuettel and Romain Fran\c{c}ois}
 \title{RcppEigen : Unit testing results}
 \begin{document}
 \maketitle
@@ -12,7 +12,7 @@
 \begin{verbatim}
 <<echo=F,results=tex>>=
 if( file.exists( "unitTests-results/RcppEigen-unitTests.txt" ) ){
-	writeLines( readLines( "unitTests-results/RcppEigen-unitTests.txt" ) )
+        writeLines( readLines( "unitTests-results/RcppEigen-unitTests.txt" ) )
 }
 @
 \end{verbatim}

Modified: pkg/RcppEigen/inst/include/RcppEigen.h
===================================================================
--- pkg/RcppEigen/inst/include/RcppEigen.h	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/inst/include/RcppEigen.h	2011-06-15 20:35:02 UTC (rev 3091)
@@ -1,8 +1,8 @@
 // -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
 //
-// RcppEigen.h: Rcpp/Armadillo glue
+// RcppEigen.h: Rcpp/Eigen glue
 //
-// Copyright (C)  2011 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)      2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of RcppEigen.
 //

Modified: pkg/RcppEigen/inst/include/RcppEigenConfig.h
===================================================================
--- pkg/RcppEigen/inst/include/RcppEigenConfig.h	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/inst/include/RcppEigenConfig.h	2011-06-15 20:35:02 UTC (rev 3091)
@@ -1,8 +1,8 @@
 // -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
 //
-// RcppEigenConfig.h: Rcpp/Armadillo glue
+// RcppEigenConfig.h: Rcpp/Eigen glue
 //
-// Copyright (C)  2011 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)      2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of RcppEigen.
 //

Modified: pkg/RcppEigen/inst/include/RcppEigenForward.h
===================================================================
--- pkg/RcppEigen/inst/include/RcppEigenForward.h	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/inst/include/RcppEigenForward.h	2011-06-15 20:35:02 UTC (rev 3091)
@@ -1,8 +1,8 @@
 // -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 8 -*-
 //
-// RcppEigenForward.h: Rcpp/Armadillo glue
+// RcppEigenForward.h: Rcpp/Eigen glue
 //
-// Copyright (C)  2011 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)      2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of RcppEigen.
 //

Modified: pkg/RcppEigen/inst/include/RcppEigenWrap.h
===================================================================
--- pkg/RcppEigen/inst/include/RcppEigenWrap.h	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/inst/include/RcppEigenWrap.h	2011-06-15 20:35:02 UTC (rev 3091)
@@ -1,8 +1,8 @@
 // -*- mode: C++; c-indent-level: 4; c-basic-offset: 4; tab-width: 4 -*-
 //
-// RcppEigenWrap.h: Rcpp/Armadillo glue
+// RcppEigenWrap.h: Rcpp/Eigen glue
 //
-// Copyright (C)  2011 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)      2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of RcppEigen.
 //

Modified: pkg/RcppEigen/inst/unitTests/runit.fastLm.R
===================================================================
--- pkg/RcppEigen/inst/unitTests/runit.fastLm.R	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/inst/unitTests/runit.fastLm.R	2011-06-15 20:35:02 UTC (rev 3091)
@@ -1,6 +1,6 @@
 #!/usr/bin/r -t
 #
-# Copyright (C) 2011	Dirk Eddelbuettel, Romain Francois and Douglas Bates
+# Copyright (C)      2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 #
 # This file is part of RcppEigen
 #

Modified: pkg/RcppEigen/man/fastLm.Rd
===================================================================
--- pkg/RcppEigen/man/fastLm.Rd	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/man/fastLm.Rd	2011-06-15 20:35:02 UTC (rev 3091)
@@ -75,7 +75,7 @@
 \seealso{\code{\link{lm}}, \code{\link{lm.fit}}} 
 \author{
   Eigen is described at \url{http://eigen.tuxfamily.org}. RcppEigen is written by
-  Romain Francois, Dirk Eddelbuettel and Douglas Bates.
+  Douglas Bates, Dirk Eddelbuettel and Romain Francois.
 }
 \examples{
   data(trees, package="datasets")

Modified: pkg/RcppEigen/src/RcppEigen.cpp
===================================================================
--- pkg/RcppEigen/src/RcppEigen.cpp	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/src/RcppEigen.cpp	2011-06-15 20:35:02 UTC (rev 3091)
@@ -2,7 +2,7 @@
 //
 // RcppEigen.cpp: Rcpp/Armadillo glue
 //
-// Copyright (C)  2010 - 2011  Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)       2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of RcppEigen.
 //

Modified: pkg/RcppEigen/src/fastLm.cpp
===================================================================
--- pkg/RcppEigen/src/fastLm.cpp	2011-06-15 19:15:00 UTC (rev 3090)
+++ pkg/RcppEigen/src/fastLm.cpp	2011-06-15 20:35:02 UTC (rev 3091)
@@ -2,7 +2,7 @@
 //
 // fastLm.cpp: Rcpp/Eigen example of a simple lm() alternative
 //
-// Copyright (C)  2010 Dirk Eddelbuettel, Romain Francois and Douglas Bates
+// Copyright (C)       2011 Douglas Bates, Dirk Eddelbuettel and Romain Francois
 //
 // This file is part of RcppEigen.
 //
@@ -17,7 +17,8 @@
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License
-// along with RcppArmadillo.  If not, see <http://www.gnu.org/licenses/>.
+// in file.path(R.home("share"), "licenses").  If not, see
+// <http://www.gnu.org/licenses/>.
 
 #include <RcppEigen.h>
 



More information about the Rcpp-commits mailing list