Merge branch '28-build-warnings' into release-0.6.0. Close #28

R/cv2logsd.R

@@ -1,4 +1,4 @@
-cv2logsd <- function(CV) {
-  SD <- sqrt( cv2logvar(CV) )
+cv2logsd <- function(x) {
+  SD <- sqrt( cv2logvar(x) )
   SD
 }

R/cv2logvar.R

@@ -1,4 +1,4 @@
-cv2logvar <- function( CV ) {
-  VAR <- (log((CV/100)^2 + 1))/(log(10)^2)
+cv2logvar <- function( x ) {
+  VAR <- (log((x/100)^2 + 1))/(log(10)^2)
   VAR
 }

R/format.float.R

@@ -1,5 +1,5 @@
-format.float <- function(value, digits = 2) {
-  value <- suppressWarnings(as.numeric(value))
-  value <- formatC(value, format = "f", digits = digits)
-  value
+format.float <- function(x, digits = 2) {
+  x <- suppressWarnings(as.numeric(x))
+  x <- formatC(x, format = "f", digits = digits)
+  x
 }

R/geocv.R

@@ -1,4 +1,4 @@
-geocv <- function(datavector, digits = 2, na.rm = TRUE) {
-  logsd <- sd(log10(datavector), na.rm = na.rm)
-  logsd2cv(logsd, digits = digits, na.rm = na.rm)
+geocv <- function(x, na.rm = TRUE) {
+  logsd <- sd(log10(x), na.rm = na.rm)
+  logsd2cv(logsd)
 }

R/geomean.R

@@ -1,4 +1,4 @@
-geomean <- function(datavector) {
-  datavector[(datavector == 0)] <- NA # discard null values
-  10^mean(log10(datavector), na.rm = T)
+geomean <- function(x) {
+  x[(x == 0)] <- NA # discard null values
+  10^mean(log10(x), na.rm = T)
 }

R/geosd.R

@@ -1,3 +1,3 @@
-geosd <- function(datavector) {
-  10^sd(log10(datavector))
+geosd <- function(x) {
+  10^sd(log10(x))
 }

R/logsd2cv.R

@@ -1,3 +1,3 @@
-logsd2cv <- function(logsd, digits = 2, na.rm = TRUE) {
-  round(sqrt(exp((log(10)^2)*logsd^2) - 1)*100 , digits)
+logsd2cv <- function(x) {
+  sqrt(exp((log(10)^2)*x^2) - 1)*100
 }

R/logvar2cv.R

@@ -1,3 +1,3 @@
-logvar2cv <- function(var, digits = 2, na.rm = TRUE) {
-  round(sqrt(exp((log(10)^2)*var) - 1)*100 , digits)
+logvar2cv <- function(x) {
+  sqrt(exp((log(10)^2)*x) - 1)*100
 }

man/format.float.Rd

@@ -11,11 +11,11 @@ Format numbers, given a `digits` argument as significant decimal places.
 {Numbers are always assumed to be \code{\link[base]{double}}.}
 }
 \usage{
-format.float(x)
+format.float(x, digits)
 }
 %- maybe also 'usage' for other objects documented here.
 \arguments{
-  \item{value}{
+  \item{x}{
   Value to be formatted.
   Input can be a numeric or character value.
   }
@@ -62,7 +62,7 @@ format.float("1.12543")
 format.float(c("1.756", "1.823"))
 
 # Useful for data frames
-DF <- data.frame(num = c(1.756, 1.823), char = c("1.756", "1.823"), stringsAsFactors = F)
+DF <- data.frame(num = c(1.756, 1.823), char = c("1.756", "1.823"), stringsAsFactors = FALSE)
 transform(DF, num = format.float(num), char = format.float(char))
 }
 % Add one or more standard keywords, see file 'KEYWORDS' in the

man/format.interval.Rd

@@ -53,7 +53,7 @@ Felipe Figueiredo
 \examples{
 format.interval(c(1.756, 1.823))
 
-format.interval(1.5, 1) # error: 1.5 is not an interval
+# format.interval(1.5, 1) # error: 1.5 is not an interval
 
 # Input is character
 format.interval(c("1.756", "1.823"))

man/geocv.Rd

@@ -8,15 +8,12 @@
 %%  ~~ A concise (1-5 lines) description of what the function does. ~~
 }
 \usage{
-geocv(x, digits = 2, na.rm = TRUE)
+geocv(x, na.rm = TRUE)
 }
 %- maybe also 'usage' for other objects documented here.
 \arguments{
   \item{x}{
 %%     ~~Describe \code{x} here~~
-}
-  \item{digits}{
-%%     ~~Describe \code{digits} here~~
 }
   \item{na.rm}{
 %%     ~~Describe \code{na.rm} here~~