k

rspatial · Mar 30, 2020 · 56f961c · 56f961c
1 parent 082b7fb
commit 56f961c
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 21 deletions.
diff --git a/R/AAgeneric_functions.R b/R/AAgeneric_functions.R
@@ -87,8 +87,14 @@ if (!isGeneric("unique")) { setGeneric("unique", function(x, incomparables=FALSE
 if (!isGeneric("union")) {setGeneric("union", function(x, y)standardGeneric("union"))}	
 if (!isGeneric("values")) { setGeneric("values", function(x, ...) standardGeneric("values")) }	
 if (!isGeneric("values<-")) { setGeneric("values<-", function(x, value) standardGeneric("values<-"))}	
+if (!isGeneric("which.max")) {setGeneric("which.max", function(x)standardGeneric("which.max"))}	
+if (!isGeneric("which.min")) {setGeneric("which.min", function(x)standardGeneric("which.min"))}	
+
 if (!isGeneric('writeRaster')) {setGeneric('writeRaster', function(x, filename, ...) standardGeneric('writeRaster'))}
 if (!isGeneric('writeValues')) { setGeneric('writeValues', function(x, v, start) standardGeneric('writeValues')) }
+
+
+
 if (!isGeneric("xres")) { setGeneric("xres", function(x) standardGeneric("xres")) }
 if (!isGeneric("yres")) { setGeneric("yres", function(x) standardGeneric("yres")) }
 if (!isGeneric("zonal")) {setGeneric("zonal", function(x, z, ...) standardGeneric("zonal"))}	

diff --git a/R/netCDFwriteCD.R b/R/netCDFwriteCD.R
@@ -66,10 +66,10 @@
 								zname <- 'time'
 							}
 							if (cls == 'Date') {
-								zatt <- list('units=days since 1970-01-01 00:00:00')
+								zatt <- list('units=days since 1970-1-1')
 								zunit <- 'days'
 							} else {
-								zatt <- list('units=seconds since 1970-01-01 00:00:00')							
+								zatt <- list('units=seconds since 1970-1-1 00:00:00')							
 								zunit <- 'seconds'
 							}
 						}

diff --git a/R/which.max.R b/R/which.max.R
@@ -3,19 +3,6 @@
 # Version 1.0
 # Licence GPL v3
 
-if (!isGeneric("which.max")) {
-	setGeneric("which.max", function(x)
-		standardGeneric("which.max"))
-}	
-
-
-if (!isGeneric("which.min")) {
-	setGeneric("which.min", function(x)
-		standardGeneric("which.min"))
-}	
-
-
-
 setMethod("which.max", "RasterLayer",  
 	function(x) { 
 		m <- maxValue(x, warn=FALSE)
@@ -119,7 +106,3 @@ setMethod("which.max", "RasterStackBrick",
 	} 
 )
 
-
-
-
-
diff --git a/R/xyCell.R b/R/xyCell.R
@@ -155,12 +155,19 @@ if (!isGeneric("coordinates")) {
 }	
 
 
-setMethod('coordinates', signature(obj='Raster'), 
+setMethod("coordinates", signature(obj="Raster"), 
     function(obj, ...){
 		xyFromCell(obj, cell=1:ncell(obj), ...)
 	}
 )
 
+setMethod("coordinates", signature(obj="Extent"), 
+    function(obj, ...){
+		e <- as.vector(obj)
+		rbind(cbind(e[1], e[3:4]), cbind(e[2], e[4:3]))
+	}
+)
+
 
 setMethod("yFromCell", signature(object="Raster",cell="numeric"), 
 	function(object, cell) {

diff --git a/man/xyFromCell.Rd b/man/xyFromCell.Rd
@@ -17,6 +17,7 @@
 \alias{xyFromCell,Raster-method}
 \alias{coordinates}
 \alias{coordinates,Raster-method}
+\alias{coordinates,Extent-method}
 
 
 \title{Coordinates from a row, column or cell number}
@@ -32,6 +33,7 @@ These functions get coordinates of the center of raster cells for a row, column,
 \S4method{yFromCell}{Raster,numeric}(object, cell)
 \S4method{xyFromCell}{BasicRaster,ANY}(object, cell, spatial=FALSE, ...)
 \S4method{coordinates}{Raster}(obj, ...)
+\S4method{coordinates}{Extent}(obj, ...)
 }
 
 

diff --git a/src/modal.cpp b/src/modal.cpp
@@ -6,7 +6,7 @@ double getMode(NumericVector values, int ties) {
 	int n = values.length();
     IntegerVector counts(n);
 
-	if (ties < 3) {
+	if (ties < 2) {
 		std::sort(values.begin(), values.end());
 	}