[Yuima-commits] r216 - in pkg/yuima: . R

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

Author: kyuta
Date: 2012-12-19 01:54:26 +0100 (Wed, 19 Dec 2012)
New Revision: 216

Modified:
   pkg/yuima/DESCRIPTION
   pkg/yuima/NEWS
   pkg/yuima/R/cce.R
   pkg/yuima/R/noisy.sampling.R
Log:
modify cce.R, noisy.sampling.R

Modified: pkg/yuima/DESCRIPTION
===================================================================
--- pkg/yuima/DESCRIPTION	2012-12-18 16:15:04 UTC (rev 215)
+++ pkg/yuima/DESCRIPTION	2012-12-19 00:54:26 UTC (rev 216)
@@ -1,7 +1,7 @@
 Package: yuima
 Type: Package
 Title: The YUIMA Project package (unstable version)
-Version: 0.1.199
+Version: 0.1.200
 Date: 2012-12-19
 Depends: methods, zoo, stats4, utils
 Suggests: cubature, mvtnorm

Modified: pkg/yuima/NEWS
===================================================================
--- pkg/yuima/NEWS	2012-12-18 16:15:04 UTC (rev 215)
+++ pkg/yuima/NEWS	2012-12-19 00:54:26 UTC (rev 216)
@@ -1,4 +1,5 @@
 2012/10/05: add mpv.R, bns.test.R, mpv.Rd, bns.test.Rd
 2012/12/13: add noisy.sampling.R, noisy.sampling.Rd
             modify bns.test.R, cce.R, llag.R, mpv.R, bns.test.Rd, cce.Rd, llag.Rd, mpv.Rd
-2012/12/19: modify cce.R
\ No newline at end of file
+2012/12/19: modify cce.R
+2012/12/19: modify cce.R, noisy.sampling.R
\ No newline at end of file

Modified: pkg/yuima/R/cce.R
===================================================================
--- pkg/yuima/R/cce.R	2012-12-18 16:15:04 UTC (rev 215)
+++ pkg/yuima/R/cce.R	2012-12-19 00:54:26 UTC (rev 216)
@@ -2192,11 +2192,14 @@
                    opt.method="BFGS",vol.init=NA,covol.init=NA,
                    nvar.init=NA,ncov.init=NA,...,mn,alpha=0.4,
                    frequency=300,avg=TRUE,threshold,utime)
-            cce(x at data,method,theta,kn,g,refreshing,cwise,
-                 delta,adj,K,c.two,J,c.multi,kernel,H,c.RK,
-                 eta,m,ftregion,opt.method,vol.init,covol.init,
-                 nvar.init,ncov.init,...,mn,alpha,
-                 frequency,avg,threshold,utime=utime))
+            cce(x at data,method=method,theta=theta,kn=kn,g=g,refreshing=refreshing,
+                cwise=cwise,delta=delta,adj=adj,K=K,c.two=c.two,J=J,
+                c.multi=c.multi,kernel=kernel,H=H,c.RK=c.RK,eta=eta,m=m,
+                ftregion=ftregion,opt.method=opt.method,vol.init=vol.init,
+                covol.init=covol.init,nvar.init=nvar.init,
+                ncov.init=ncov.init,...,mn=mn,alpha=alpha,
+                frequency=frequency,avg=avg,threshold=threshold,
+                utime=utime))
 
 setMethod("cce",signature(x="yuima.data"),
           function(x,method="HY",theta,kn,g=function(x)min(x,1-x),

Modified: pkg/yuima/R/noisy.sampling.R
===================================================================
--- pkg/yuima/R/noisy.sampling.R	2012-12-18 16:15:04 UTC (rev 215)
+++ pkg/yuima/R/noisy.sampling.R	2012-12-19 00:54:26 UTC (rev 216)
@@ -21,7 +21,8 @@
 
 setMethod("noisy.sampling",signature(x="yuima"),
           function(x,var.adj=0,rng="rnorm",mean.adj=0,...,end.coef=0,n,order.adj=0,znoise)
-            noisy.sampling(x at data,var.adj,rng,mean.adj,...,end.coef,n,order.adj,znoise=znoise))
+            noisy.sampling(x at data,var.adj=var.adj,rng=rng,mean.adj=mean.adj,...,
+                           end.coef=end.coef,n=n,order.adj=order.adj,znoise=znoise))
 
 setMethod("noisy.sampling",signature(x="yuima.data"),
           function(x,var.adj=0,rng="rnorm",mean.adj=0,...,