minor reformatting

r-quantities · Aug 13, 2016 · d727646 · d727646
1 parent 2eca8f6
commit d727646
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 19 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,8 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
 S3method("[",units)
-S3method("units<-",numeric)
-S3method("units<-",units)
 S3method(Math,units)
 S3method(Ops,units)
 S3method(Summary,units)
@@ -17,6 +15,8 @@ S3method(print,units)
 S3method(quantile,units)
 S3method(units,units)
 S3method(weighted.mean,units)
+export("units<-")
+export("units<-.units")
 export(as.dt)
 export(as.units)
 import(stats)

diff --git a/R/conversion.R b/R/conversion.R
@@ -8,7 +8,7 @@ NULL
 #' Set measurement units on a numeric vector
 #'
 #' @param x numeric vector
-#' @param value character; valid unit of measurement string
+#' @param value character; unit of measurement string
 #'
 #' @return object of class \code{units}
 #' @export
@@ -20,10 +20,10 @@ NULL
 #' class(x)
 #' y = 2:5
 #' try(units(y) <- "xxy") # error
-`units<-.numeric` = function(x, value) {
+`units<-.numeric` = function(x, strict.ud = FALSE, value) {
   stopifnot(is.character(value))
   if (!ud.is.parseable(value))
-    stop(paste(value, "not recognized as a unit of measurement"))
+    stop(paste(value, "not recognized as a udunits2 unit of measurement"))
   attr(x, "units") = value
   class(x) = "units"
   x

diff --git a/man/Math.units.Rd b/man/Math.units.Rd
diff --git a/man/Ops.units.Rd b/man/Ops.units.Rd
diff --git a/man/as.dt.Rd b/man/as.dt.Rd
diff --git a/man/as.units.Rd b/man/as.units.Rd
diff --git a/man/as.units.difftime.Rd b/man/as.units.difftime.Rd
diff --git a/man/units-set-.numeric.Rd → man/units-set.Rd b/man/units-set-.numeric.Rd → man/units-set.Rd
diff --git a/man/units.Rd b/man/units.Rd
diff --git a/man/units.units.Rd b/man/units.units.Rd
diff --git a/units.Rproj b/units.Rproj
@@ -15,3 +15,4 @@ LaTeX: pdfLaTeX
 BuildType: Package
 PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source
+PackageRoxygenize: rd,collate,namespace