Skip to content
Snippets Groups Projects
Commit 9dbdc7ab authored by Tolosana Delgado, Dr. Raimon (FWGB) - 18653's avatar Tolosana Delgado, Dr. Raimon (FWGB) - 18653
Browse files

minor corrections in as_directorVector

parent d03004b7
No related branches found
No related tags found
No related merge requests found
...@@ -1009,6 +1009,7 @@ as.gmEVario <- function(vgemp,...){ UseMethod("as.gmEVario",vgemp)} ...@@ -1009,6 +1009,7 @@ as.gmEVario <- function(vgemp,...){ UseMethod("as.gmEVario",vgemp)}
#' @describeIn as.gmEVario default method #' @describeIn as.gmEVario default method
#' @method as.gmEVario default #' @method as.gmEVario default
#' @export
as.gmEVario.default <- function(vgemp,...) vgemp as.gmEVario.default <- function(vgemp,...) vgemp
...@@ -1070,13 +1071,13 @@ variogramModelPlot.gmEVario <- function(vg, model = NULL, # gstat or variogra ...@@ -1070,13 +1071,13 @@ variogramModelPlot.gmEVario <- function(vg, model = NULL, # gstat or variogra
if(is.null(model)) if(is.null(model))
return(invisible(opar)) return(invisible(opar))
# OTHERWISE: add the curves for the model # OTHERWISE: add the curves for the model
aux = as.directorVector(attr(vg, "directions")) aux = as_directorVector(attr(vg, "directions"))
if(!is.null(vdir.lo)) vdir.lo = aux[vdir.lo,] if(!is.null(vdir.lo)) vdir.lo = aux[vdir.lo,]
if(!is.null(vdir.up)) vdir.up = aux[vdir.up,] if(!is.null(vdir.up)) vdir.up = aux[vdir.up,]
opar = plot(as.gmCgram(model), vdir.up= vdir.up, vdir.lo= vdir.lo, add=TRUE, cov =FALSE, ...) opar = plot(as.gmCgram(model), vdir.up= vdir.up, vdir.lo= vdir.lo, add=TRUE, cov =FALSE, ...)
#f = as.function(as.gmCgram(gg)) #f = as.function(as.gmCgram(gg))
#Dv = dim(vg$gamma)[2] #Dv = dim(vg$gamma)[2]
#dirs = as.directorVector(attr(vg, "directions")) #dirs = as_directorVector(attr(vg, "directions"))
#Dg = ncol(dirs) #Dg = ncol(dirs)
#for(i in 1:Dv){ #for(i in 1:Dv){
# for(j in 1:Dv){ # for(j in 1:Dv){
...@@ -1176,7 +1177,7 @@ gsi.directorVector = function(x){ ...@@ -1176,7 +1177,7 @@ gsi.directorVector = function(x){
} }
print.directionClass = function(x, complete=TRUE, ...){ print.directionClass = function(x, complete=TRUE, ...){
cat(paste("with",nrow(as.directorVector(x)),"directions\n")) cat(paste("with",nrow(as_directorVector(x)),"directions\n"))
if(complete){ if(complete){
print(unclass(x), ...) print(unclass(x), ...)
} }
...@@ -1185,13 +1186,13 @@ print.directionClass = function(x, complete=TRUE, ...){ ...@@ -1185,13 +1186,13 @@ print.directionClass = function(x, complete=TRUE, ...){
# @export # @export
as.directorVector <- function(x, ...){ UseMethod("as.directorVector",x) } as_directorVector <- function(x, ...){ UseMethod("as_directorVector",x) }
#' @method as.directorVector default #' @method as_directorVector default
as.directorVector.default = function(x) x as_directorVector.default = function(x) x
#' @method as.directorVector azimuth #' @method as_directorVector azimuth
as.directorVector.azimuth = function(x, D=2){ as_directorVector.azimuth = function(x, D=2){
res = cbind(cos(pi/2-x), sin(pi/2-x)) res = cbind(cos(pi/2-x), sin(pi/2-x))
if(D>2){ if(D>2){
res = cbind(res, matrix(0, ncol=D-2, nrow=nrow(res))) res = cbind(res, matrix(0, ncol=D-2, nrow=nrow(res)))
...@@ -1200,10 +1201,10 @@ as.directorVector.azimuth = function(x, D=2){ ...@@ -1200,10 +1201,10 @@ as.directorVector.azimuth = function(x, D=2){
return(gsi.directorVector(res)) return(gsi.directorVector(res))
} }
#' @method as.directorVector azimuthInterval #' @method as_directorVector azimuthInterval
as.directorVector.azimuthInterval = function(x, D=2, ...){ as_directorVector.azimuthInterval = function(x, D=2, ...){
res = (x[[1]]+x[[2]])/2 res = (x[[1]]+x[[2]])/2
return(as.directorVector.azimuth(res)) return(as_directorVector.azimuth(res))
} }
......
...@@ -17,15 +17,16 @@ ...@@ -17,15 +17,16 @@
## This is a resubmission, after archiving on 2023-04-05 ## This is a resubmission, after archiving on 2023-04-05
### Changes occurring after submission on 2023-04-13 14:09
### Changes occurring after submission on 2023-04-13 15:57
``` ```
Dear maintainer, Dear maintainer,
package gmGeostats_0.11.3.tar.gz does not pass the incoming checks automatically, please see the following pre-tests: package gmGeostats_0.11.3.tar.gz does not pass the incoming checks automatically, please see the following pre-tests:
Windows: <https://win-builder.r-project.org/incoming_pretest/gmGeostats_0.11.3_20230413_140847/Windows/00check.log> Windows: <https://win-builder.r-project.org/incoming_pretest/gmGeostats_0.11.3_20230413_155730/Windows/00check.log>
Status: 1 NOTE Status: 1 NOTE
Debian: <https://win-builder.r-project.org/incoming_pretest/gmGeostats_0.11.3_20230413_140847/Debian/00check.log> Debian: <https://win-builder.r-project.org/incoming_pretest/gmGeostats_0.11.3_20230413_155730/Debian/00check.log>
Status: 2 NOTEs Status: 2 NOTEs
Please fix all problems and resubmit a fixed version via the webform. Please fix all problems and resubmit a fixed version via the webform.
...@@ -38,45 +39,40 @@ Flavor: r-devel-linux-x86_64-debian-gcc ...@@ -38,45 +39,40 @@ Flavor: r-devel-linux-x86_64-debian-gcc
Following changes done: Following changes done:
* Check: S3 generic/method consistency, Result: NOTE * Check: S3 generic/method consistency, Result: NOTE
Mismatches for apparent methods not registered:
as.directorVector:
function(x, ...)
as.directorVector.default:
function(x)
as.directorVector: as.directorVector:
function(x) --> converted to function(x, ...) function(x, ...)
as.directorVector.azimuth: as.directorVector.azimuth:
function(x, D) function(x, D)
as.directorVector.azimuthInterval:
function(x, D)
image: as.directorVector renamed to as_directorVector, as it is only an internal function
function(x, ...)
image.polargrid:
function(r, phi, z, zlim, rlim, philim, col, add, xaxs, yaxs, probs,
breaks, ...)
image.polargrid: --> renamed to image_polargrid as this is a non-exported internal function
* Apparent methods for exported generics not registered: * Apparent methods for exported generics not registered:
as.AnisotropyScaling.double --> alias removed
as.LMCAnisCompo.LMCAnisCompo --> added to NAMESPACE
as.LMCAnisCompo.gmCgram --> added to NAMESPACE
as.gmCgram.LMCAnisCompo --> added to NAMESPACE
as.gmCgram.variogramModel --> added to NAMESPACE
as.gmCgram.variogramModelList --> added to NAMESPACE
as.gmEVario.default --> added to NAMESPACE as.gmEVario.default --> added to NAMESPACE
as.gmEVario.gstatVariogram --> added to NAMESPACE
as.gmEVario.logratioVariogram --> added to NAMESPACE
as.gmEVario.logratioVariogramAnisotropy --> added to NAMESPACE Apologies for the repeated errors. We cannot reproduce them in our Ubuntu systems, and hence cannot check completely that they disappeared.
as.gmSpatialModel.default --> added to NAMESPACE
as.gmSpatialModel.gstat --> added to NAMESPACE
as.gstatVariogram.default --> added to NAMESPACE
as.gstatVariogram.gmEVario --> added to NAMESPACE
as.logratioVariogram.gmEVario --> added to NAMESPACE
as.logratioVariogram.gstatVariogram --> added to NAMESPACE
as.logratioVariogram.logratioVariogram --> added to NAMESPACE
pairsmap.SpatialPointsDataFrame --> added to NAMESPACE
unmask.SpatialPoints --> added to NAMESPACE
Additionally, the following words are all correct:
Possibly misspelled words in DESCRIPTION:
Boogaart (36:10)
Geostatistics (4:8)
Tolosana (35:36)
geostatistical (30:26)
microstructural (32:51)
multipoint (34:52)
best regards
### Original request ### Original request
Request from 2023-03-19. All calls to .C() are now explicitly pointing Request from 2023-03-19. All calls to .C() are now explicitly pointing
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment