Skip to content

Commit 2cf9ec2

Browse files
committed
version 4.8
1 parent 2bc8162 commit 2cf9ec2

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

R/MCM.sde.R

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -270,19 +270,7 @@ print.MCM.sde <- function(x, digits=NULL, ...)
270270
" | t in [",format(x$mod$t0,digits=digits),",",format(x$mod$T,digits=digits),"] with mesh equal to ",format(x$mod$Dt,digits=digits),"\n",
271271
sep="")}
272272
}} else {
273-
if (x$Class=="snssde1d"){
274-
Dr <- deparse(eval(substitute(substitute(e, list(x=quote(X(t)))), list(e = x$mod$drift))))
275-
DD <- deparse(eval(substitute(substitute(e, list(x=quote(X(t)))), list(e = x$mod$diffusion))))
276-
if(x$mod$type=="ito"){
277-
cat(Ito," Sde 1D:","\n",
278-
" | dX(t) = ", Dr," * dt + ", DD," * dW(t)","\n",
279-
" | t in [",format(x$mod$t0,digits=digits),",",format(x$mod$T,digits=digits),"] with mesh equal to ",format(x$mod$Dt,digits=digits),"\n",
280-
sep="")}else{
281-
cat("Stratonovich Sde 1D:","\n",
282-
" | dX(t) = ", Dr," * dt + ", DD," o dW(t)","\n",
283-
" | t in [",format(x$mod$t0,digits=digits),",",format(x$mod$T,digits=digits),"] with mesh equal to ",format(x$mod$Dt,digits=digits),"\n",
284-
sep="")}
285-
}else if (x$Class=="snssde2d"){
273+
if (x$Class=="snssde2d"){
286274
Drx <- deparse(eval(substitute(substitute(e, list(x=quote(X(t)),y=quote(Y(t)))), list(e = x$mod$driftx))))
287275
DDx <- deparse(eval(substitute(substitute(e, list(x=quote(X(t)),y=quote(Y(t)))), list(e = x$mod$diffx))))
288276
Dry <- deparse(eval(substitute(substitute(e, list(x=quote(X(t)),y=quote(Y(t)))), list(e = x$mod$drifty))))

tests/MCM_test.R

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@ sde.fun1d <- function(data, i){
2020
return(c(mean(d),var(d)))
2121
}
2222
# Parallel MOnte Carlo for mod1
23+
24+
mcm.mod1 = MCM.sde(model=mod1,statistic=sde.fun1d,R=1, exact=list(m=E.mod1(1),S=V.mod1(1)))
25+
mcm.mod1 = MCM.sde(model=mod1,statistic=sde.fun1d,R=5, names=c("Ex","Vx"))
2326
mcm.mod1 = MCM.sde(model=mod1,statistic=sde.fun1d,R=5, exact=list(m=E.mod1(1),S=V.mod1(1)))
27+
mcm.mod1 = MCM.sde(model=mod1,statistic=sde.fun1d,R=5, exact=list(m=E.mod1(1),S=V.mod1(1)),names=c("Ex","Vx"))
28+
mcm.mod1 = MCM.sde(model=mod1,statistic=sde.fun1d,R=5)
29+
mcm.mod1 = MCM.sde(model=mod1,statistic=sde.fun1d,R=5, exact=list(m=E.mod1(1),S=V.mod1(1)),parallel="multicore",ncpus=2)
2430
mcm.mod1 = MCM.sde(model=mod1,statistic=sde.fun1d,R=5, exact=list(m=E.mod1(1),S=V.mod1(1)),parallel="snow",cl= parallel::makeCluster(getOption("cl.cores", 2)),ncpus=2)
2531
mcm.mod1 = MCM.sde(model=mod1,statistic=sde.fun1d,R=5, exact=list(m=E.mod1(1),S=V.mod1(1)),parallel="snow",ncpus=2)
2632
print(mcm.mod1)
@@ -33,6 +39,8 @@ print(mcm.mod2)
3339
plot(mcm.mod1,index = 1) # mean
3440
plot(mcm.mod1,index = 2) # variance
3541

42+
plot(mcm.mod1,index = c(1,2))
43+
3644
## ----fig.cap=' MC output of mean and variance of `mod2`', fig.env='figure*'----
3745
# plot(s) of Monte Carlo outputs of mod2
3846
plot(mcm.mod2,index = 1) # mean
@@ -58,6 +66,7 @@ sde.fun2d <- function(data, i){
5866
}
5967
## Parallel Monte-Carlo of 'OUI' at time 10
6068
mcm.mod2d = MCM.sde(OUI,statistic=sde.fun2d,time=10,R=5,exact=tvalue)
69+
mcm.mod2d = MCM.sde(OUI,statistic=sde.fun2d,time=10,R=5,exact=tvalue,parallel="multicore",ncpus=2)
6170
mcm.mod2d = MCM.sde(OUI,statistic=sde.fun2d,time=10,R=5,exact=tvalue,parallel="snow",cl= parallel::makeCluster(getOption("cl.cores", 2)),ncpus=2)
6271
mcm.mod2d = MCM.sde(OUI,statistic=sde.fun2d,time=10,R=5,exact=tvalue,parallel="snow",ncpus=2)
6372
print(mcm.mod2d)
@@ -139,6 +148,7 @@ sde.fun3d <- function(data, i){
139148
}
140149
## Monte-Carlo at time = 10
141150
mcm.mod3d = MCM.sde(modtra,statistic=sde.fun3d,R=5)
151+
mcm.mod3d = MCM.sde(modtra,statistic=sde.fun3d,R=5,parallel="multicore",ncpus=2)
142152
mcm.mod3d = MCM.sde(modtra,statistic=sde.fun3d,R=5,parallel="snow",cl= parallel::makeCluster(getOption("cl.cores", 2)),ncpus=2)
143153
mcm.mod3d = MCM.sde(modtra,statistic=sde.fun3d,R=5,parallel="snow",ncpus=2)
144154
print(mcm.mod3d)

0 commit comments

Comments
 (0)