[Blotter-commits] r643 - pkg/RTAQ/R

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

Author: jonathan
Date: 2011-06-26 18:38:04 +0200 (Sun, 26 Jun 2011)
New Revision: 643

Modified:
   pkg/RTAQ/R/aggregate.R
Log:


Modified: pkg/RTAQ/R/aggregate.R
===================================================================
--- pkg/RTAQ/R/aggregate.R	2011-06-25 20:53:58 UTC (rev 642)
+++ pkg/RTAQ/R/aggregate.R	2011-06-26 16:38:04 UTC (rev 643)
@@ -80,7 +80,7 @@
                 tby = "h"
             }
             by = paste(k, tby, sep = " ")
-            allindex = as.timeDate(seq(start(ts3), end(ts3), 
+            allindex = as.timeDate(base:::seq(start(ts3), end(ts3), 
                 by = by))
             xx = xts(rep("1", length(allindex)), order.by = allindex)
             ts3 = merge(ts3, xx)[, (1:dim(ts)[2])]
@@ -98,7 +98,7 @@
     
     FUN = match.fun(FUN);
     
-    g = seq(start(ts), end(ts), by = tby);
+    g = base:::seq(start(ts), end(ts), by = tby);
     rawg = as.numeric(as.POSIXct(g,tz="GMT"));
     newg = rawg + (secs - rawg%%secs);
     g = as.timeDate(as.POSIXct(newg,origin="1970-01-01",tz="GMT"));