[Stpp-commits] r43 - pkg/R

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

Author: gabriele
Date: 2012-04-01 15:25:01 +0200 (Sun, 01 Apr 2012)
New Revision: 43

Modified:
   pkg/R/plot.stpp.R
   pkg/R/rinfec.r
   pkg/R/rinter.r
   pkg/R/stan.R
Log:


Modified: pkg/R/plot.stpp.R
===================================================================
--- pkg/R/plot.stpp.R	2012-04-01 13:08:49 UTC (rev 42)
+++ pkg/R/plot.stpp.R	2012-04-01 13:25:01 UTC (rev 43)
@@ -36,11 +36,11 @@
 	       if (mark.col=="black" | mark.col==1)	
 	           COL=grey((l:1)/l)
            if (mark.col=="red" | mark.col==2)	
-	           COL=rgb(l:0, 0, 0, max = l)
+	           COL=rgb(l:0, 0, 0, maxColorValue = l)
       	   if (mark.col=="green" | mark.col==3)	
-        	   COL=rgb(0, l:0, 0, max = l)
+        	   COL=rgb(0, l:0, 0, maxColorValue = l)
 	       if (mark.col=="blue" | mark.col==4)	
-	           COL=rgb(0, 0, l:0, max = l)
+	           COL=rgb(0, 0, l:0, maxColorValue = l)
 	       par(mfrow=c(1,1),pty="s")
     	  if (is.null(s.region))	
 	     	plot(x[,1:2],col=COL,cex=CEX,...)

Modified: pkg/R/rinfec.r
===================================================================
--- pkg/R/rinfec.r	2012-04-01 13:08:49 UTC (rev 42)
+++ pkg/R/rinfec.r	2012-04-01 13:25:01 UTC (rev 43)
@@ -134,7 +134,7 @@
   ni <- 1
   while(ni<=nsim)
     {
-      xy <- csr(n=1,poly=s.region)
+      xy <- csr(npoints=1,poly=s.region)
       npts <- 1
       pattern.interm <- cbind(x=xy[1],y=xy[2],t=t0)
       Mu <- rep(0,nt)
@@ -260,7 +260,7 @@
                      else
                        {
 				 uk <- runif(1)
-                         xy <- csr(n=1,poly=s.region)
+                         xy <- csr(npoints=1,poly=s.region)
                          xp <- xy[1]
                          yp <- xy[2]
                          

Modified: pkg/R/rinter.r
===================================================================
--- pkg/R/rinter.r	2012-04-01 13:08:49 UTC (rev 42)
+++ pkg/R/rinter.r	2012-04-01 13:25:01 UTC (rev 43)
@@ -87,7 +87,7 @@
           return(res)
         }
 
-  xy <- csr(n=1,poly=s.region)
+  xy <- csr(npoints=1,poly=s.region)
   npts <- 1
   pattern.interm <- cbind(x=xy[1],y=xy[2])
   if (inhibition==TRUE)
@@ -95,7 +95,7 @@
       while(npts < npoints)
         {
           prob <- runif(1)
-          xy <- csr(n=1,poly=s.region)
+          xy <- csr(npoints=1,poly=s.region)
           if (all((sqrt((xy[1] - pattern.interm[,1])^2 + (xy[2] - pattern.interm[,2])^2)) > delta))
             umax <- 1
             else			
@@ -116,7 +116,7 @@
           continue <- FALSE
           while(continue==FALSE)
             {
-              xy <- csr(n=1,poly=s.region)
+              xy <- csr(npoints=1,poly=s.region)
               if (all(sqrt((xy[1] - pattern.interm[,1])^2 + (xy[2] - pattern.interm[,2])^2) < delta))
                 umax <- 1            
               else		

Modified: pkg/R/stan.R
===================================================================
--- pkg/R/stan.R	2012-04-01 13:08:49 UTC (rev 42)
+++ pkg/R/stan.R	2012-04-01 13:25:01 UTC (rev 43)
@@ -74,8 +74,8 @@
 }
 
 .store = function(panel){
- assign("t",panel$t,env=panel$e)
- assign("width",panel$width,env=panel$e)
+ assign("t",panel$t,envir=panel$e)
+ assign("width",panel$width,envir=panel$e)
  return(panel)
 }
 
@@ -165,7 +165,7 @@
   env = .rp.stan3d(XYT,tlim,twid,states)
   ret=list()
   for(n in ls(env)){
-    ret[[n]]=get(n,env=env)
+    ret[[n]]=get(n,envir=env)
   }
   return(ret)
 }