[Pomp-commits] r795 - branches/mif2/tests

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

Author: kingaa
Date: 2013-01-08 12:06:53 +0100 (Tue, 08 Jan 2013)
New Revision: 795

Modified:
   branches/mif2/tests/aou2-mif-fp.R
   branches/mif2/tests/ou2-mif2-mif.R
Log:
- reformat


Modified: branches/mif2/tests/aou2-mif-fp.R
===================================================================
--- branches/mif2/tests/aou2-mif-fp.R	2013-01-08 10:57:25 UTC (rev 794)
+++ branches/mif2/tests/aou2-mif-fp.R	2013-01-08 11:06:53 UTC (rev 795)
@@ -12,38 +12,38 @@
 
 set.seed(64857673L)
 mif1 <- mif(ou2,Nmif=100,start=guess1,
-		pars=c('alpha.2','alpha.3'),ivps=c('x1.0','x2.0'),
-		rw.sd=c(
-				x1.0=.5,x2.0=.5,
-				alpha.2=0.1,alpha.3=0.1),
-		transform=F,
-		Np=1000,
-		var.factor=1,
-		ic.lag=10,
-		cooling.factor=0.95,
-		cooling.fraction=0.05,
-		option="mif2",
-		.ndone=0,tol=10^-8,
-		verbose=F
-)
-#set.seed(64857673L)
+            pars=c('alpha.2','alpha.3'),ivps=c('x1.0','x2.0'),
+            rw.sd=c(
+              x1.0=.5,x2.0=.5,
+              alpha.2=0.1,alpha.3=0.1),
+            transform=F,
+            Np=1000,
+            var.factor=1,
+            ic.lag=10,
+            cooling.factor=0.95,
+            cooling.fraction=0.05,
+            option="mif2",
+            .ndone=0,tol=10^-8,
+            verbose=F
+            )
+##set.seed(64857673L)
 mif2 <- mif(ou2,Nmif=100,start=guess1,
-		pars=c('alpha.2','alpha.3'),ivps=c('x1.0','x2.0'),
-		rw.sd=c(
-				x1.0=0.5,x2.0=.5,
-				alpha.2=0.1,alpha.3=0.1),
-		transform=F,
-		cooling.scalar=430,
-		Np=1000,
-		var.factor=1,
-		ic.lag=10,
-		cooling.factor=0.95,
-		cooling.fraction=0.5,
-		max.fail=100,
-		option="mif",
-		.ndone=0,tol=10^-8,
-		verbose=F
-)  
+            pars=c('alpha.2','alpha.3'),ivps=c('x1.0','x2.0'),
+            rw.sd=c(
+              x1.0=0.5,x2.0=.5,
+              alpha.2=0.1,alpha.3=0.1),
+            transform=F,
+            cooling.scalar=430,
+            Np=1000,
+            var.factor=1,
+            ic.lag=10,
+            cooling.factor=0.95,
+            cooling.fraction=0.5,
+            max.fail=100,
+            option="mif",
+            .ndone=0,tol=10^-8,
+            verbose=F
+            )  
 compare.mif(list(mif1,mif2))
 
 dev.off()

Modified: branches/mif2/tests/ou2-mif2-mif.R
===================================================================
--- branches/mif2/tests/ou2-mif2-mif.R	2013-01-08 10:57:25 UTC (rev 794)
+++ branches/mif2/tests/ou2-mif2-mif.R	2013-01-08 11:06:53 UTC (rev 795)
@@ -12,39 +12,49 @@
 
 set.seed(64857673L)
 mif0 <- mif(ou2,Nmif=50,start=guess1,
-		pars=c('alpha.2','alpha.3'),ivps=c('x1.0','x2.0'),
-		rw.sd=c(
-				x1.0=.5,x2.0=.5,
-				alpha.2=0.1,alpha.3=0.1),
-		transform=F,
-		Np=1000,
-		var.factor=1,
-		ic.lag=10,
-		cooling.factor=0.95,
-		cooling.fraction=0.05,
-		option="mif2",
-		.ndone=0
+            pars=c('alpha.2','alpha.3'),ivps=c('x1.0','x2.0'),
+            rw.sd=c(
+              x1.0=.5,x2.0=.5,
+              alpha.2=0.1,alpha.3=0.1),
+            transform=F,
+            Np=1000,
+            var.factor=1,
+            ic.lag=10,
+            cooling.factor=0.95,
+            cooling.fraction=0.05,
+            option="mif2",
+            .ndone=0
 
-)
+            )
 mif1<-continue(mif0,Nmif=50)
 
 mif2 <- mif(ou2,Nmif=100,start=guess1,
-		pars=c('alpha.2','alpha.3'),ivps=c('x1.0','x2.0'),
-		rw.sd=c(
-				x1.0=0.5,x2.0=.5,
-				alpha.2=0.1,alpha.3=0.1),
-		transform=F,
-		Np=1000,
-		var.factor=1,
-		ic.lag=10,
-		cooling.factor=0.95,
-		max.fail=100,
-		option="mif",
-		.ndone=0
+            pars=c('alpha.2','alpha.3'),ivps=c('x1.0','x2.0'),
+            rw.sd=c(
+              x1.0=0.5,x2.0=.5,
+              alpha.2=0.1,alpha.3=0.1),
+            transform=F,
+            Np=1000,
+            var.factor=1,
+            ic.lag=10,
+            cooling.factor=0.95,
+            max.fail=100,
+            option="mif",
+            .ndone=0
+            )  
 
-)  
-
 compare.mif(list(mif1,mif2))
 
 dev.off()
 
+
+
+
+
+
+
+
+
+
+
+