Skip to content

Commit c52e41d

Browse files
committed
fixes for covar methods + bump version, update NEWS
1 parent cd56148 commit c52e41d

File tree

6 files changed

+30
-2
lines changed

6 files changed

+30
-2
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: quantities
22
Type: Package
33
Title: Quantity Calculus for R Vectors
4-
Version: 0.2.2
4+
Version: 0.2.3
55
Authors@R: c(
66
person("Iñaki", "Ucar", email="iucar@fedoraproject.org",
77
role=c("aut", "cph", "cre"), comment=c(ORCID="0000-0001-6403-5550")))

NAMESPACE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ S3method(as.list,quantities)
2323
S3method(as.matrix,quantities)
2424
S3method(c,quantities)
2525
S3method(cbind,quantities)
26+
S3method(correl,quantities)
27+
S3method(covar,quantities)
2628
S3method(diff,quantities)
2729
S3method(drop_errors,quantities)
2830
S3method(drop_quantities,data.frame)

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# quantities 0.2.3
2+
3+
- Fixes for `covar` and `correl` implementations.
4+
15
# quantities 0.2.2
26

37
- Performance improvements for `data.frame` methods.

R/errors.R

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,12 @@ errors_min.units <- function(x)
9999
#' correl(x, y)
100100
#' covar(x, y)
101101
#'
102+
#' @name correl
103+
#' @export
104+
correl.quantities <- function(x, y) {
105+
NextMethod()
106+
}
107+
102108
#' @name correl
103109
#' @export
104110
`correl<-.quantities` <- function(x, y, value) {
@@ -109,11 +115,20 @@ errors_min.units <- function(x)
109115
NextMethod()
110116
}
111117

118+
#' @name correl
119+
#' @export
120+
covar.quantities <- function(x, y) {
121+
if (!is.null(xy <- NextMethod()))
122+
units(xy) <- as_units(units(x)) * as_units(units(y))
123+
xy
124+
}
125+
112126
#' @name correl
113127
#' @export
114128
`covar<-.quantities` <- function(x, y, value) {
115129
stopifnot(inherits(y, "quantities"))
116130
stopifnot(inherits(value, "units"))
117-
stopifnot(ud_are_convertible(units(value), units(x*y)))
131+
units(value) <- units(x*y)
132+
value <- drop_units(value)
118133
NextMethod()
119134
}

man/correl.Rd

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

quantities.Rproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Version: 1.0
2+
ProjectId: 433c14c0-a10f-4673-8146-09557d5bfd2f
23

34
RestoreWorkspace: Default
45
SaveWorkspace: Default

0 commit comments

Comments
 (0)