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

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

Author: lorenzo
Date: 2014-11-27 10:31:54 +0100 (Thu, 27 Nov 2014)
New Revision: 357

Modified:
   pkg/yuima/DESCRIPTION
   pkg/yuima/R/qmle.R
Log:


Modified: pkg/yuima/DESCRIPTION
===================================================================
--- pkg/yuima/DESCRIPTION	2014-11-26 11:06:19 UTC (rev 356)
+++ pkg/yuima/DESCRIPTION	2014-11-27 09:31:54 UTC (rev 357)
@@ -1,8 +1,8 @@
 Package: yuima
 Type: Package
 Title: The YUIMA Project package for SDEs
-Version: 1.0.53
-Date: 2014-11-26
+Version: 1.0.54
+Date: 2014-11-27
 Depends: methods, zoo, stats4, utils, expm, cubature, mvtnorm
 Author: YUIMA Project Team
 Maintainer: Stefano M. Iacus <stefano.iacus at unimi.it>

Modified: pkg/yuima/R/qmle.R
===================================================================
--- pkg/yuima/R/qmle.R	2014-11-26 11:06:19 UTC (rev 356)
+++ pkg/yuima/R/qmle.R	2014-11-27 09:31:54 UTC (rev 357)
@@ -1121,8 +1121,8 @@
         }
         
         if(aggregation==TRUE){
-          if(floor(yuima at sampling@n/yuima at sampling@Termina)!=yuima at sampling@n/yuima at sampling@Termina){
-            yuima.warn("the n/Terminal in sampling information is not an integer. Aggregation=FALSE is recommended")
+          if(floor(yuima at sampling@n/yuima at sampling@Terminal)!=yuima at sampling@n/yuima at sampling@Terminal){
+            yuima.stop("the n/Terminal in sampling information is not an integer. Set Aggregation=FALSE")
           }
           inc.levy1<-diff(cumsum(inc.levy)[seq(from=1,
                                                to=yuima at sampling@n[1],
@@ -1225,8 +1225,8 @@
           return(carma_final_res)
         }
         if(aggregation==TRUE){
-          if(floor(yuima at sampling@n/yuima at sampling@Termina)!=yuima at sampling@n/yuima at sampling@Termina){
-            yuima.warn("the n/Terminal in sampling information is not an integer. Aggregation=FALSE is recommended")
+          if(floor(yuima at sampling@n/yuima at sampling@Terminal)!=yuima at sampling@n/yuima at sampling@Terminal){
+            yuima.stop("the n/Terminal in sampling information is not an integer. Aggregation=FALSE is recommended")
           }
          inc.levy1<-diff(cumsum(inc.levy)[seq(from=1,
                                               to=yuima at sampling@n[1],