version 4.2

Author: ac-guidoum

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: Sim.DiffProc
 Type: Package
-Version: 4.1
-Date: 2018-09-09
+Version: 4.2
+Date: 2018-10-10
 Title: Simulation of Diffusion Processes
 Authors@R: c(
     person("Arsalane Chouaib", "Guidoum",
@@ -13,7 +13,7 @@ Author: Arsalane Chouaib Guidoum [cre, aut],
   Kamal Boukhetala [aut]
 Maintainer: Arsalane Chouaib Guidoum <[email protected]>
 Depends: R (>= 2.15.1)
-Imports: Deriv (>= 3.8.0), MASS, parallel, rgl (>= 0.66), scatterplot3d (>= 0.3-36)
+Imports: Deriv (>= 3.8.0), MASS, parallel, rgl (>= 0.93.991), scatterplot3d (>= 0.3-36)
 Suggests: deSolve (>= 1.11), knitr, sm (>= 2.2-5.3)
 BugReports: https://github.com/acguidoum/Sim.DiffProc/issues
 URL: https://github.com/acguidoum/Sim.DiffProc

R/Tex.sde.r

@@ -131,12 +131,24 @@ TEX.sde.default <- function(object, ...)
     cat(knitr::kable(object, format = "latex",...),
         "\n")
     }else if (class(object) == "MCM.sde"){
-    mod <- object$MC
+    tab <- object$MC
+    greek_test <- as.list(c(mem_sde,mem_sde_tex,greek,greek1,greek2,greek3,greek4,greek5,
+               greek6,greek7,greek8,greek9,greek10,greek_list,
+              greek_list1,greek_list2,greek_list3,greek_list4,greek_list5,
+             greek_list6,greek_list7,greek_list8,greek_list9,greek_list10))
+    expr <- parse(text = rownames(tab))
+    names <- all.names(expr )
+    symbol_list   <- setNames(as.list(names), names)
+    symbol_env  <- list2env(symbol_list, parent = f_env)
+    greek_env   <- clone_env(greek_env, parent = symbol_env)
+    rownames(tab)  <- sapply(1:length(names),function(i) eval(expr[i], latex_env(expr[i])))
+    rownames(tab)  <- sapply(1:length(names),function(i) ifelse(rownames(tab)[i]%in%greek_test,paste0("$", rownames(tab)[i],"$") ,rownames(tab)[i]) )
+    colnames(tab)[length(names(tab))] <- "CI( 2.5 \\% , 97.5 \\% )"
     cat("%%% LaTeX table generated in R",strsplit(version[['version.string']], ' ')[[1]][3],"by TEX.sde() method",
         "\n")
     cat("%%% Copy and paste the following output in your LaTeX file",
         "\n\n")
-    cat(knitr::kable(mod, format = "latex",...),
+    cat(knitr::kable(tab, format = "latex", escape = FALSE,...),
         "\n")
     }else if (class(object) == "expression"){
     expr <- object

R/ftpsde.R

@@ -31,10 +31,12 @@ fptsde1d <- function(object, ...)  UseMethod("fptsde1d")
 fptsde1d.default <- function(object,boundary,...)
                      {
     class(object) <- "snssde1d"
-    if (any(!is.expression(boundary))) stop(" must be expressions of a constant or time-dependent boundary ")
+    if (any(!is.expression(boundary))) 
+	          stop(" must be expressions of a constant or time-dependent boundary ")
     R   <- data.frame(object$X)
     Bn  <- function(t)  eval(boundary)
-    if(object$x0==Bn(object$t0)) warning(paste("x0 = S(t0) ==> crossing realized at time",object$t0))
+    if(object$x0==Bn(object$t0)) 
+	          warning(paste("x0 = S(t0) ==> crossing realized at time",object$t0))
     F   <- lapply(1:as.numeric(object$M),function(i) stats::approxfun(time(object),as.vector(R[,i])) )
       if (as.numeric(object$x0) > Bn(as.numeric(object$t0))){
            v1  <- sapply(1:length(F),function(i) ifelse(length(which(R[,i] <= Bn(time(object))))==0, NA,min(which(R[,i] <= Bn(time(object))))))
@@ -234,11 +236,13 @@ fptsde2d <- function(object, ...)  UseMethod("fptsde2d")
 fptsde2d.default <- function(object,boundary,...)
                      {
     class(object) <- "snssde2d"
-    if (any(!is.expression(boundary))) stop(" must be expression of a constant or time-dependent boundary ")
+    if (any(!is.expression(boundary))) 
+	         stop(" must be expression of a constant or time-dependent boundary ")
     R1   <- data.frame(object$X)
     R2   <- data.frame(object$Y)
     Bn  <- function(t)  eval(boundary) 
-    if(object$x0==Bn(object$t0) | object$y0==Bn(object$t0) ) warning(paste("x0 = S(t0) or y0 =S(t0) ==> crossing realized at time",object$t0))
+    if(object$x0==Bn(object$t0) | object$y0==Bn(object$t0) ) 
+	         warning(paste("x0 = S(t0) or y0 =S(t0) ==> crossing realized at time",object$t0))
     F1   <- lapply(1:as.numeric(object$M),function(i) stats::approxfun(time(object),as.vector(R1[,i])) )
     F2   <- lapply(1:as.numeric(object$M),function(i) stats::approxfun(time(object),as.vector(R2[,i])) )
     if (as.numeric(object$x0) > Bn(as.numeric(object$t0))){
@@ -536,12 +540,14 @@ fptsde3d <- function(object, ...)  UseMethod("fptsde3d")
 fptsde3d.default <- function(object,boundary,...)
                      {
     class(object) <- "snssde3d"
-    if (any(!is.expression(boundary))) stop(" must be expression of a constant or time-dependent boundary ")
+    if (any(!is.expression(boundary))) 
+	         stop(" must be expression of a constant or time-dependent boundary ")
     R1   <- data.frame(object$X)
     R2   <- data.frame(object$Y)
     R3   <- data.frame(object$Z)	
     Bn  <- function(t)  eval(boundary)
-    if(object$x0==Bn(object$t0) | object$y0==Bn(object$t0) | object$z0==Bn(object$t0) ) warning(paste("x0 = S(t0) or y0 =S(t0) or z0 =S(t0) ==> crossing realized at time",object$t0))
+    if(object$x0==Bn(object$t0) | object$y0==Bn(object$t0) | object$z0==Bn(object$t0) ) 
+	         warning(paste("x0 = S(t0) or y0 =S(t0) or z0 =S(t0) ==> crossing realized at time",object$t0))
     F1   <- lapply(1:as.numeric(object$M),function(i) stats::approxfun(time(object),as.vector(R1[,i])) )
     F2   <- lapply(1:as.numeric(object$M),function(i) stats::approxfun(time(object),as.vector(R2[,i])) )
     F3   <- lapply(1:as.numeric(object$M),function(i) stats::approxfun(time(object),as.vector(R3[,i])) )

README.md

@@ -2,7 +2,7 @@
 
 [![Project Status](https://www.repostatus.org/badges/latest/active.svg?style=popout)](https://cran.r-project.org/src/contrib/Archive/Sim.DiffProc/)
 [![Travis Build Status](https://travis-ci.org/acguidoum/Sim.DiffProc.svg?branch=master)](https://travis-ci.org/acguidoum/Sim.DiffProc)
-[![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/65glhgavh266hkyk/branch/master?svg=true)](https://ci.appveyor.com/project/acguidoum/sim-diffproc/branch/master) [![codecov](https://codecov.io/gh/acguidoum/Sim.DiffProc/branch/master/graph/badge.svg)](https://codecov.io/gh/acguidoum/Sim.DiffProc)
+[![Build status](https://ci.appveyor.com/api/projects/status/16a70vyf8rk7nn1i?svg=true)](https://ci.appveyor.com/project/acguidoum/sim-diffproc-xal8n) [![codecov](https://codecov.io/gh/acguidoum/Sim.DiffProc/branch/master/graph/badge.svg)](https://codecov.io/gh/acguidoum/Sim.DiffProc)
 
 
 ------------------------------------------------------------------------
@@ -11,7 +11,7 @@
 [![minimal R version](https://img.shields.io/badge/R%3E%3D-2.15.1-blue.svg?style=flat-plastic)](https://cran.r-project.org/) 
 
 ------------------------------------------------------------------------
-
+![Github](https://img.shields.io/badge/Github-4.2(at:10.10.2018)-blue.svg)
 ![](http://www.r-pkg.org/badges/version-last-release/Sim.DiffProc?color=blue) [![Rdoc](http://www.rdocumentation.org/badges/version/Sim.DiffProc)](http://www.rdocumentation.org/packages/Sim.DiffProc)
 
 
@@ -74,22 +74,22 @@ use `citation()` for information on how to cite the software;
 
 ```r
 citation("Sim.DiffProc")
-#> 
-#> To cite package 'Sim.DiffProc' in publications use:
-#> 
-#>   Arsalane Chouaib Guidoum and Kamal Boukhetala (2018).
-#>   Sim.DiffProc: Simulation of Diffusion Processes.R package
-#>   version 4.1.https://cran.r-project.org/package=Sim.DiffProc
-#> 
-#> A BibTeX entry for LaTeX users is
-#> 
-#>   @Manual{,
-#>     title = {Sim.DiffProc: Simulation of Diffusion Processes.},
-#>     author = {Arsalane Chouaib Guidoum and Kamal Boukhetala},
-#>     year = {2018},
-#>     note = {R package version 4.1},
-#>     url = {https://cran.r-project.org/package=Sim.DiffProc},
-#>   }
+ 
+To cite package 'Sim.DiffProc' in publications use:
+
+  Arsalane Chouaib Guidoum and Kamal Boukhetala (2018).
+  Sim.DiffProc: Simulation of Diffusion Processes.R package
+  version 4.1.https://cran.r-project.org/package=Sim.DiffProc
+
+A BibTeX entry for LaTeX users is
+
+  @Manual{,
+    title = {Sim.DiffProc: Simulation of Diffusion Processes.},
+    author = {Arsalane Chouaib Guidoum and Kamal Boukhetala},
+    year = {2018},
+    note = {R package version 4.1},
+    url = {https://cran.r-project.org/package=Sim.DiffProc},
+  }
 ```
 
 Note

man/Sim.DiffProc-package.Rd

@@ -16,11 +16,11 @@ A package for symbolic and numerical computations on scalar and multivariate sys
 \tabular{ll}{
 Package: \tab Sim.DiffProc \cr
 Type: \tab Package \cr
-Version: \tab 4.1 \cr
-Date: \tab 2018-09-09 \cr
+Version: \tab 4.2 \cr
+Date: \tab 2018-10-10 \cr
 License: \tab GPL (>= 2) \cr
 Depends: \tab R (>= 2.15.1) \cr
-Imports: \tab Deriv (>= 3.8.0), MASS, parallel, rgl (>= 0.66), scatterplot3d (>= 0.3-36) \cr
+Imports: \tab Deriv (>= 3.8.0), MASS, parallel, rgl (>= 0.93.991), scatterplot3d (>= 0.3-36) \cr
 Suggests: \tab deSolve (>= 1.11), knitr, sm (>= 2.2-5.3) \cr
 Classification/MSC:\tab 37H10, 37M10, 60H05, 60H10, 60H35, 60J60, 65C05, 68N15, 68Q10 \cr
 }