[Yuima-commits] r504 - pkg/yuima/R

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

Author: lorenzo
Date: 2016-11-01 11:34:41 +0100 (Tue, 01 Nov 2016)
New Revision: 504

Modified:
   pkg/yuima/R/setPpr.R
   pkg/yuima/R/simulateMultiProcess.R
Log:
PPr simulation and definition using yuima.law

Modified: pkg/yuima/R/setPpr.R
===================================================================
--- pkg/yuima/R/setPpr.R	2016-10-31 20:25:14 UTC (rev 503)
+++ pkg/yuima/R/setPpr.R	2016-11-01 10:34:41 UTC (rev 504)
@@ -62,11 +62,17 @@
   yuima1 <- setYuima(model =yuima)
   type <- yuima at measure.type
   if(type == "code"){
-    measure <- list(df = as.character(yuima at measure$df$expr))
-  }
+    if(!(is(yuima at measure$df,"yuima.law")))
+      measure <- list(df = as.character(yuima at measure$df$expr))
+  }else{
+    measure <- yuima at measure
+    }
   if(type == "CP"){
-    measure <- list(intensity = as.character(yuima at measure$intensity),
+    if(!(is(yuima at measure$df,"yuima.law")))
+      measure <- list(intensity = as.character(yuima at measure$intensity),
                     df= as.character(yuima at measure$df$expr))
+  }else{
+    measure <- yuima at measure
   }
   if(general){
     covariates<-character()

Modified: pkg/yuima/R/simulateMultiProcess.R
===================================================================
--- pkg/yuima/R/simulateMultiProcess.R	2016-10-31 20:25:14 UTC (rev 503)
+++ pkg/yuima/R/simulateMultiProcess.R	2016-11-01 10:34:41 UTC (rev 504)
@@ -40,6 +40,7 @@
 
    ##:: errors checks
     if(is(object at model@measure$df,"yuima.law")&& is.null(increment.L)){
+      samp<- object at sampling
       randomGenerator<-object at model@measure$df
       if(samp at regular){
         tForMeas<-samp at delta
@@ -101,7 +102,7 @@
     }
    ##:1: error on yuima model
    yuima <- object
-
+   samp <- object at sampling
    if(missing(yuima)){
      yuima.warn("yuima object is missing.")
      return(NULL)