[Raster-commits] r157 - pkg/raster/man

noreply at r-forge.r-project.org noreply at r-forge.r-project.org
Mon Jan 19 13:57:36 CET 2009 

Author: rhijmans
Date: 2009-01-19 13:57:36 +0100 (Mon, 19 Jan 2009)
New Revision: 157

Modified:
   pkg/raster/man/Arith-methods.Rd
   pkg/raster/man/Compare-methods.Rd
   pkg/raster/man/Math-methods.Rd
   pkg/raster/man/Summary-methods.Rd
   pkg/raster/man/adjacency.Rd
   pkg/raster/man/aggregate.Rd
   pkg/raster/man/calc.Rd
   pkg/raster/man/cell.values.Rd
   pkg/raster/man/change.extent.Rd
   pkg/raster/man/coerce.Rd
   pkg/raster/man/data.Rd
   pkg/raster/man/get.Rd
   pkg/raster/man/mCalc.Rd
   pkg/raster/man/map.Rd
   pkg/raster/man/properties.Rd
   pkg/raster/man/set.Rd
   pkg/raster/man/values.Rd
Log:
ncells() -> ncell()

Modified: pkg/raster/man/Arith-methods.Rd
===================================================================
--- pkg/raster/man/Arith-methods.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/Arith-methods.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -15,8 +15,8 @@
 
 \examples{
 r1 <- newRaster(ncols=10, nrows=10)
-r1 <- setValues(r1, runif(ncells(r1)))
-r2 <- setValues(r1, 1:ncells(r1)) / ncells(r1)
+r1 <- setValues(r1, runif(ncell(r1)))
+r2 <- setValues(r1, 1:ncell(r1)) / ncell(r1)
 r3 <- r1 * (r2 - 1 + r1^2 / r2)
 }
 

Modified: pkg/raster/man/Compare-methods.Rd
===================================================================
--- pkg/raster/man/Compare-methods.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/Compare-methods.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -16,8 +16,8 @@
 
 \examples{
 r1 <- newRaster()
-r1 <- setValues(r1, round(10 * runif(ncells(r1))))
-r2 <- setValues(r1, round(10 * runif(ncells(r1))))
+r1 <- setValues(r1, round(10 * runif(ncell(r1))))
+r2 <- setValues(r1, round(10 * runif(ncell(r1))))
 as(r1, "BasicRaster") == as(r2, "BasicRaster")
 r3 <- r1 > r2
 

Modified: pkg/raster/man/Math-methods.Rd
===================================================================
--- pkg/raster/man/Math-methods.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/Math-methods.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -16,7 +16,7 @@
 
 \examples{
 r1 <- newRaster()
-r1 <- (setValues(r1, runif(ncells(r1))) - 0.5 ) * 10
+r1 <- (setValues(r1, runif(ncell(r1))) - 0.5 ) * 10
 r2 <- abs(r1)
 r3 <- sqrt(r1)
 }

Modified: pkg/raster/man/Summary-methods.Rd
===================================================================
--- pkg/raster/man/Summary-methods.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/Summary-methods.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -18,7 +18,7 @@
 
 \examples{
 r1 <- newRaster()
-r1 <- setValues(r1, runif(ncells(r1)))
+r1 <- setValues(r1, runif(ncell(r1)))
 r2 <- 2 * r1 * r1
 r3 <- sqrt(r1) * 5
 r4 <- max(r1, r2, r3)

Modified: pkg/raster/man/adjacency.Rd
===================================================================
--- pkg/raster/man/adjacency.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/adjacency.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -32,14 +32,14 @@
 
 \examples{
 	rs <- newRaster(nrows=10, ncols=10)
-	adj <- adjacency(raster = rs, fromCells = c(1,30,55,72,100), toCells = c(1:ncells(rs)), directions=4, outerMeridianConnect = TRUE) 
-	v <- vector(length=ncells(rs))
+	adj <- adjacency(raster = rs, fromCells = c(1,30,55,72,100), toCells = c(1:ncell(rs)), directions=4, outerMeridianConnect = TRUE) 
+	v <- vector(length=ncell(rs))
 	v[adj[,2]] <- 2
 	v[adj[,1]] <- 1
 	rs <- setValues(rs, v)
 	plot(rs)
 
-	adjbis <- adjBishop(raster = rs, fromCells = c(1,30,55,72,100), toCells = c(1:ncells(rs)), outerMeridianConnect = TRUE) 
+	adjbis <- adjBishop(raster = rs, fromCells = c(1,30,55,72,100), toCells = c(1:ncell(rs)), outerMeridianConnect = TRUE) 
 }
 
 \keyword{spatial}

Modified: pkg/raster/man/aggregate.Rd
===================================================================
--- pkg/raster/man/aggregate.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/aggregate.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -36,7 +36,7 @@
 
 \examples{
 	r <- newRaster()
-	r <- setValues(r, runif(ncells(r)))
+	r <- setValues(r, runif(ncell(r)))
 	ra <- Aggregate(r, fact=10, fun=max)
 	rd <- disaggregate(ra, 3)
 }

Modified: pkg/raster/man/calc.Rd
===================================================================
--- pkg/raster/man/calc.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/calc.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -58,7 +58,7 @@
  set1function <- function(x){rep(1, x)}
  r <- init(r, fun=set1function)
 # "manually" 
- r <- setValues(r, rep(1, ncells(r)))
+ r <- setValues(r, rep(1, ncell(r)))
  
 # random values (see ?runif )
  r <- init(r, fun=runif)

Modified: pkg/raster/man/cell.values.Rd
===================================================================
--- pkg/raster/man/cell.values.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/cell.values.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -39,7 +39,7 @@
 \examples{
 #using a new default raster (1 degree global)
 r <- newRaster()
-r <- setValues(r, 1:ncells(r))
+r <- setValues(r, 1:ncell(r))
 cellValues(r, c(1, 10, 100))
 xy <- cbind(1:20, 20:1)
 xyValues(r, xy)

Modified: pkg/raster/man/change.extent.Rd
===================================================================
--- pkg/raster/man/change.extent.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/change.extent.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -36,7 +36,7 @@
 
 \examples{
 	rs <- newRaster()
-	rs <- setValues(rs, runif(ncells(rs)))
+	rs <- setValues(rs, runif(ncell(rs)))
 #	map(rsa)
 	bb1 <- newBbox(-180, -150, 60, 90)
 	rsc1 <- crop(rs, bb1)	

Modified: pkg/raster/man/coerce.Rd
===================================================================
--- pkg/raster/man/coerce.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/coerce.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -45,7 +45,7 @@
 
 \examples{ 
 	rs <- newRaster()
-	rs <- setValues(rs, 1:ncells(rs))
+	rs <- setValues(rs, 1:ncell(rs))
 	sp <- asSpGrid(rs)
 	rs2 <- asRasterLayer(sp) 
 }

Modified: pkg/raster/man/data.Rd
===================================================================
--- pkg/raster/man/data.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/data.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -30,7 +30,7 @@
 rs <- newRaster()
 dataContent(rs)
 dataIndices(rs)
-rs <- setValues(rs, 1:ncells(rs))
+rs <- setValues(rs, 1:ncell(rs))
 cellValues(rs, c(1, 10, 100))
 dataSource(rs)
 dataContent(rs)

Modified: pkg/raster/man/get.Rd
===================================================================
--- pkg/raster/man/get.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/get.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -67,7 +67,7 @@
 \examples{
 #using a new default raster (1 degree global)
 rs <- newRaster()
-ncells(rs)
+ncell(rs)
 colFromCell(rs, 10000)
 rowFromCell(rs, 10000)
 colFromX(rs, 0.5)
@@ -76,13 +76,13 @@
 xFromCol(rs, c(1, 120, 180))
 yFromRow(rs, 90)
 xyFromCell(rs, 10000)
-xyFromCell(rs, c(0, 1, 32581, ncells(rs), ncells(rs)+1))
+xyFromCell(rs, c(0, 1, 32581, ncell(rs), ncell(rs)+1))
 
 #using a file from disk
 rs <- rasterFromFile(system.file("external/test.ag", package="sp"))
 rs
 cellFromXY(rs, c(180000, 330000))
 #xy for corners of grid:
-xyFromCell(rs, c(1, ncol(rs), nrow(rs), ncells(rs)))
+xyFromCell(rs, c(1, ncol(rs), nrow(rs), ncell(rs)))
 }
 \keyword{spatial}

Modified: pkg/raster/man/mCalc.Rd
===================================================================
--- pkg/raster/man/mCalc.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/mCalc.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -38,7 +38,7 @@
  set1function <- function(x){rep(1, x)}
  r <- init(r, fun=set1function)
 # 2, "manually" 
- r <- setValues(r, rep(1, ncells(r)))
+ r <- setValues(r, rep(1, ncell(r)))
  
 # random values (see ?runif )
  r <- init(r, fun=runif)

Modified: pkg/raster/man/map.Rd
===================================================================
--- pkg/raster/man/map.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/map.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -48,7 +48,7 @@
 
 \examples{ 
 	rs <- newRaster()
-	rs <- setValues(rs, runif(ncells(rs)))
+	rs <- setValues(rs, runif(ncell(rs)))
 	map(rs)
 	rsa <- Aggregate(rs, fact=10, fun=max)
 	map(rsa)

Modified: pkg/raster/man/properties.Rd
===================================================================
--- pkg/raster/man/properties.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/properties.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -38,8 +38,8 @@
 filename(object)
 ncol(x)
 nrow(x)
-ncells(object)
 ncell(object)
+ncell(object)
 xres(object)
 yres(object)
 resolution(object)
@@ -79,10 +79,10 @@
 \examples{
 #using a new default raster (1 degree global)
 rs <- newRaster()
-ncells(rs)
+ncell(rs)
 ncol(rs)
 nrow(rs)
-ncells(rs)
+ncell(rs)
 xres(rs)
 yres(rs)
 resolution(rs)

Modified: pkg/raster/man/set.Rd
===================================================================
--- pkg/raster/man/set.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/set.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -69,7 +69,7 @@
 	rs <- setProjection(rs, "+proj=longlat +datum=WGS84")
 	rs <- setDatatype(rs, datatype="integer", datasize=4)
 	rs <- setDatatype(rs, datatype="numeric", datasize=8)
-	vals <- 1:ncells(rs)
+	vals <- 1:ncell(rs)
 	rs <- setValues(rs, vals)
 	rs <- clearValues(rs)
 	rowvals <- 1:ncol(rs)

Modified: pkg/raster/man/values.Rd
===================================================================
--- pkg/raster/man/values.Rd	2009-01-19 09:33:28 UTC (rev 156)
+++ pkg/raster/man/values.Rd	2009-01-19 12:57:36 UTC (rev 157)
@@ -43,10 +43,10 @@
 \examples{
 #using a new default raster (1 degree global)
 r <- newRaster()
-r <- setValues(r, 1:ncells(r))
+r <- setValues(r, 1:ncell(r))
 minValue(r)
 maxValue(r)
-r <- setValues(r, round(100 * runif(ncells(r)) + 0.5))
+r <- setValues(r, round(100 * runif(ncell(r)) + 0.5))
 minValue(r)
 maxValue(r)

More information about the Raster-commits mailing list