[Raster-commits] r171 - pkg/raster/R

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

Author: rhijmans
Date: 2009-01-22 06:48:24 +0100 (Thu, 22 Jan 2009)
New Revision: 171

Modified:
   pkg/raster/R/compare.R
   pkg/raster/R/writeGDAL.R
Log:


Modified: pkg/raster/R/compare.R
===================================================================
--- pkg/raster/R/compare.R	2009-01-22 05:44:07 UTC (rev 170)
+++ pkg/raster/R/compare.R	2009-01-22 05:48:24 UTC (rev 171)
@@ -55,8 +55,8 @@
 			dif1 <- origin(objects[[1]]) - origin(objects[[i]])
 			dif2 <- abs(origin(objects[[1]])) - origin(objects[[i]])
 			dif3 <- abs(origin(objects[[i]])) - origin(objects[[1]])
-			dif4 <- pmin(dif1, dif2, dif3)
-			if (!(isTRUE(all.equal(dif4, c(0,0), tolerance=tolerance, scale=minres)))) {
+			dif <- pmin(dif1, dif2, dif3)
+			if (!(isTRUE(all.equal(dif, c(0,0), tolerance=tolerance, scale=minres)))) {
 				result <- F
 				if (stopiffalse) { stop('different origin') }
 				if (showwarning) { warning('different origin') }

Modified: pkg/raster/R/writeGDAL.R
===================================================================
--- pkg/raster/R/writeGDAL.R	2009-01-22 05:44:07 UTC (rev 170)
+++ pkg/raster/R/writeGDAL.R	2009-01-22 05:48:24 UTC (rev 171)
@@ -57,7 +57,7 @@
 .writeGDALrow <- function(raster, gdalfiletype, overwrite, ForceIntOutput, mvFlag, options ) {
 	
 	rownr <- rowFromCell(raster, dataIndices(raster)[1])
-	if (rownr %in%  c(1, 5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000, 10000, 20000, 30000, 40000, 50000, 100000)) {
+	if (rownr %in%  c(1, 10, 50, 100, 250, 500, 1000, 2500, 5000, 10000, 20000, 30000, 40000, 50000, 100000)) {
 		print( paste("writing row", rownr, "at:", format(Sys.time(), "%H:%M:%S")))
 	}
 	if ( rownr == 1) {