[Xts-commits] r766 - in pkg/xts: . inst/include src

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

Author: edd
Date: 2013-01-25 23:48:37 +0100 (Fri, 25 Jan 2013)
New Revision: 766

Modified:
   pkg/xts/DESCRIPTION
   pkg/xts/inst/include/xts.h
   pkg/xts/inst/include/xtsAPI.h
   pkg/xts/src/init.c
   pkg/xts/src/xts.h
Log:
o  export a number of additional C level functions by 
   - including them in xts.h to be declared
   - export them in init.c
   - make them accessible by clients in xtsAPI.h
o  increase Version: to be one micro-level ahead of CRAN version allowing versioned Depends:


Modified: pkg/xts/DESCRIPTION
===================================================================
--- pkg/xts/DESCRIPTION	2013-01-25 03:10:06 UTC (rev 765)
+++ pkg/xts/DESCRIPTION	2013-01-25 22:48:37 UTC (rev 766)
@@ -1,7 +1,7 @@
 Package: xts
 Type: Package
 Title: eXtensible Time Series
-Version: 0.9-1.2
+Version: 0.9-3.1
 Date: 2013-01-14
 Author: Jeffrey A. Ryan, Joshua M. Ulrich
 Depends: zoo (>= 1.7-2)

Modified: pkg/xts/inst/include/xts.h
===================================================================
--- pkg/xts/inst/include/xts.h	2013-01-25 03:10:06 UTC (rev 765)
+++ pkg/xts/inst/include/xts.h	2013-01-25 22:48:37 UTC (rev 766)
@@ -76,6 +76,14 @@
 SEXP col_names(SEXP args);
 SEXP naCheck(SEXP x, SEXP check);
 
+SEXP make_index_unique(SEXP x, SEXP eps);
+SEXP make_unique(SEXP X, SEXP eps);
+SEXP endpoints(SEXP x, SEXP on, SEXP addlast);
+SEXP do_merge_xts(SEXP x, SEXP y, SEXP all, SEXP fill, SEXP retclass, SEXP colnames, 
+                  SEXP suffixes, SEXP retside, SEXP env, int coerce);
+SEXP na_omit_xts(SEXP x);
+SEXP na_locf(SEXP x, SEXP fromlast, SEXP maxgap);
+
 SEXP tryXts(SEXP x);
 
 

Modified: pkg/xts/inst/include/xtsAPI.h
===================================================================
--- pkg/xts/inst/include/xtsAPI.h	2013-01-25 03:10:06 UTC (rev 765)
+++ pkg/xts/inst/include/xtsAPI.h	2013-01-25 22:48:37 UTC (rev 766)
@@ -93,6 +93,49 @@
     return fun(x, k, pad);
 }
 
+SEXP attribute_hidden xtsMakeIndexUnique(SEXP x, SEXP eps) {
+    static SEXP(*fun)(SEXP,SEXP) = NULL;
+    if (fun == NULL) 
+	fun = (SEXP(*)(SEXP,SEXP)) R_GetCCallable("xts","make_index_unique");
+    return fun(x, eps);
+}
+
+SEXP attribute_hidden xtsMakeUnique(SEXP x, SEXP eps) {
+    static SEXP(*fun)(SEXP,SEXP) = NULL;
+    if (fun == NULL) 
+	fun = (SEXP(*)(SEXP,SEXP)) R_GetCCallable("xts","make_unique");
+    return fun(x, eps);
+}
+
+SEXP attribute_hidden xtsEndpoints(SEXP x, SEXP on, SEXP k, SEXP addlast) {
+    static SEXP(*fun)(SEXP,SEXP,SEXP,SEXP) = NULL;
+    if (fun == NULL) 
+        fun = (SEXP(*)(SEXP,SEXP,SEXP,SEXP)) R_GetCCallable("xts","endpoints");
+    return fun(x, on, k, addlast);
+}
+
+SEXP attribute_hidden xtsMerge(SEXP x, SEXP y, SEXP all, SEXP fill, SEXP retclass, 
+                               SEXP colnames, SEXP suffixes, SEXP retside, SEXP env, int coerce) {
+    static SEXP(*fun)(SEXP,SEXP,SEXP,SEXP,SEXP,SEXP,SEXP,SEXP,SEXP,int) = NULL;
+    if (fun == NULL) 
+	fun = (SEXP(*)(SEXP,SEXP)) R_GetCCallable("xts","do_merge_xts");
+    return fun(x, y, all, fill, retclass, colnames, suffixes, retside, env, coerce);
+}
+
+SEXP attribute_hidden xtsNaOmit(SEXP x) {
+    static SEXP(*fun)(SEXP) = NULL;
+    if (fun == NULL) 
+        fun = (SEXP(*)(SEXP)) R_GetCCallable("xts","na_omit_xts");
+    return fun(x);
+}
+
+SEXP attribute_hidden xtsNaLocf(SEXP x, SEXP fromLast, SEXP maxgap) {
+  static SEXP(*fun)(SEXP,SEXP,SEXP) = NULL;
+    if (fun == NULL) 
+      fun = (SEXP(*)(SEXP,SEXP,SEXP)) R_GetCCallable("xts","na_locf");
+    return fun(x, fromLast, maxgap);
+}
+
 #ifdef __cplusplus
 }
 #endif

Modified: pkg/xts/src/init.c
===================================================================
--- pkg/xts/src/init.c	2013-01-25 03:10:06 UTC (rev 765)
+++ pkg/xts/src/init.c	2013-01-25 22:48:37 UTC (rev 766)
@@ -69,6 +69,13 @@
   R_RegisterCCallable("xts","naCheck",      (DL_FUNC) &naCheck);
   R_RegisterCCallable("xts","lagXts",       (DL_FUNC) &lagXts);
 
+  R_RegisterCCallable("xts","make_index_unique", (DL_FUNC) &make_index_unique);
+  R_RegisterCCallable("xts","make_unique",       (DL_FUNC) &make_unique);
+  R_RegisterCCallable("xts","endpoints",         (DL_FUNC) &endpoints);
+  R_RegisterCCallable("xts","do_merge_xts",      (DL_FUNC) &do_merge_xts);
+  R_RegisterCCallable("xts","na_omit_xts",       (DL_FUNC) &na_omit_xts);
+  R_RegisterCCallable("xts","na_locf",           (DL_FUNC) &na_locf);
+
   /* used by xts (functions moved from xts to zoo) */
   zoo_lag      = (SEXP(*)(SEXP,SEXP,SEXP)) R_GetCCallable("zoo","zoo_lag");
   zoo_coredata = (SEXP(*)(SEXP,SEXP))      R_GetCCallable("zoo","zoo_coredata");

Modified: pkg/xts/src/xts.h
===================================================================
--- pkg/xts/src/xts.h	2013-01-25 03:10:06 UTC (rev 765)
+++ pkg/xts/src/xts.h	2013-01-25 22:48:37 UTC (rev 766)
@@ -75,6 +75,14 @@
 SEXP col_names(SEXP args);
 SEXP naCheck(SEXP x, SEXP check);
 
+SEXP make_index_unique(SEXP x, SEXP eps);
+SEXP make_unique(SEXP X, SEXP eps);
+SEXP endpoints(SEXP x, SEXP on, SEXP addlast);
+SEXP do_merge_xts(SEXP x, SEXP y, SEXP all, SEXP fill, SEXP retclass, SEXP colnames, 
+                  SEXP suffixes, SEXP retside, SEXP env, int coerce);
+SEXP na_omit_xts(SEXP x);
+SEXP na_locf(SEXP x, SEXP fromlast, SEXP maxgap);
+
 SEXP tryXts(SEXP x);