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

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

Author: lorenzo
Date: 2019-02-03 15:49:28 +0100 (Sun, 03 Feb 2019)
New Revision: 687

Modified:
   pkg/yuima/R/AuxMethodforPPR.R
   pkg/yuima/R/simulateForPpr.R
Log:
Updated yuimaPPR


Modified: pkg/yuima/R/AuxMethodforPPR.R
===================================================================
--- pkg/yuima/R/AuxMethodforPPR.R	2018-12-04 12:50:20 UTC (rev 686)
+++ pkg/yuima/R/AuxMethodforPPR.R	2019-02-03 14:49:28 UTC (rev 687)
@@ -65,7 +65,7 @@
   
   #+sum((param-oldpar)^2*param^2)/2
   # line 40 necessary for the development of the cod
-  cat("\n ",logLik, param)
+  #cat("\n ",logLik, param)
   
   #assign("oldpar",param,envir = my.envd1)
   

Modified: pkg/yuima/R/simulateForPpr.R
===================================================================
--- pkg/yuima/R/simulateForPpr.R	2018-12-04 12:50:20 UTC (rev 686)
+++ pkg/yuima/R/simulateForPpr.R	2019-02-03 14:49:28 UTC (rev 687)
@@ -660,7 +660,8 @@
     
     ExprHaz <- constHazIntPr(g.Fun = object at gFun@formula,
        Kern.Fun = object at Kernel, covariates = object at PPR@covariates,
-       counting.var = object at PPR@counting.var)$Intens
+       counting.var = object at PPR@counting.var,
+       statevar = object at model@state.variable)$Intens
     
     
     # Start Simulation PPR
@@ -1644,7 +1645,8 @@
 
       ExprHaz <- constHazIntPr(g.Fun = object at gFun@formula,
         Kern.Fun = object at Kernel, covariates = object at PPR@covariates,
-        counting.var = object at PPR@counting.var)$Intens
+        counting.var = object at PPR@counting.var,
+        statevar = object at model@state.variable)$Intens
      # if(FALSE){
      if(length(ExprHaz)>=1){