[Rcpp-commits] r4450 - in pkg/RcppXts: man src tests

[noreply at r-forge.r-project.org]

Author: edd
Date: 2013-08-30 03:34:19 +0200 (Fri, 30 Aug 2013)
New Revision: 4450

Modified:
   pkg/RcppXts/man/RcppXts-package.Rd
   pkg/RcppXts/src/xtsMod.cpp
   pkg/RcppXts/tests/checks.R
Log:
minor updates

Modified: pkg/RcppXts/man/RcppXts-package.Rd
===================================================================
--- pkg/RcppXts/man/RcppXts-package.Rd	2013-08-27 16:03:24 UTC (rev 4449)
+++ pkg/RcppXts/man/RcppXts-package.Rd	2013-08-30 01:34:19 UTC (rev 4450)
@@ -13,7 +13,7 @@
 \alias{xtsMakeUnique}
 \alias{xtsMerge}
 \alias{xtsNaOmit}
-\alias{xtsNaLocf},
+\alias{xtsNaLocf}
 \docType{package}
 \title{Interface to the C API of xts}
 \description{This package helps with an Rcpp-based interface to the API

Modified: pkg/RcppXts/src/xtsMod.cpp
===================================================================
--- pkg/RcppXts/src/xtsMod.cpp	2013-08-27 16:03:24 UTC (rev 4449)
+++ pkg/RcppXts/src/xtsMod.cpp	2013-08-30 01:34:19 UTC (rev 4450)
@@ -87,9 +87,9 @@
 
     function("xtsMerge",
              &xtsMerge,
-             List::create(Named("x"), Named("y"), Named("all"), Named("fill"), Named("retclass"),
-                          Named("colnames"), Named("suffixes"), Named("retside"),
-                          Named("env"), Named("coerce")),
+             List::create(Named("x"), Named("y"), Named("all"), Named("fill"), 
+                          Named("retclass"), Named("colnames"), Named("suffixes"), 
+                          Named("retside"), Named("env"), Named("coerce")),
              "Merge two series");
 
     function("xtsNaOmit",
@@ -97,7 +97,7 @@
              List::create(Named("x")),
              "Omit NA values");
 
-    // -- this requires xts 0.9-6 or later (fixed in SVN)
+    // -- this requires xts 0.9-7 or later 
     function("xtsNaLocf",
              &xtsNaLocf,
              List::create(Named("x"), Named("fromLast"), Named("maxgap"), Named("limit")),

Modified: pkg/RcppXts/tests/checks.R
===================================================================
--- pkg/RcppXts/tests/checks.R	2013-08-27 16:03:24 UTC (rev 4449)
+++ pkg/RcppXts/tests/checks.R	2013-08-30 01:34:19 UTC (rev 4450)
@@ -35,8 +35,6 @@
 xtsEndpoints(index(X), 60L, 4, TRUE)     # every fourth minute, incl last
 xtsEndpoints(index(X), 60L, 4, FALSE)    # every fourth minute
 
-#stop("now")
-#xtsMerge(X, X2, c(TRUE,TRUE), TRUE, TRUE, "a", "b", TRUE, new.env(), 0)
 Y <- 2*X
 #index(Y) <- index(Y) + runif(length(X)) * 0.01
 #xtsMerge(X, Y, c(TRUE,TRUE), TRUE, TRUE, "a", "b", TRUE, new.env(), 0)
@@ -47,9 +45,7 @@
 
 xtsMerge(X, X, c(TRUE,TRUE), TRUE, TRUE, c("a", "b"), NULL, TRUE, new.env(), 0)
 
-
-## -- requires xts 0.9-6 (fixed in SVN)
-## Y2 <- X2
-## Y2[3] <- NA
-## Y2
-## xtsNaLocf(Y2, FALSE, 1, Inf)
+Y2 <- X2
+Y2[3] <- NA
+Y2
+xtsNaLocf(Y2, FALSE, 1, Inf)