Skip to content

Commit

Permalink
Merge pull request #281 from taiyun/dev
Browse files Browse the repository at this point in the history
v0.95
  • Loading branch information
taiyun authored Oct 14, 2024
2 parents bfb57f5 + 9062795 commit 0818eb6
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 9 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: corrplot
Type: Package
Title: Visualization of a Correlation Matrix
Version: 0.94
Date: 2024-08-02
Version: 0.95
Date: 2024-10-14
Authors@R: c(
person('Taiyun', 'Wei', email = 'weitaiyun@gmail.com', role = c('cre', 'aut')),
person('Viliam', 'Simko', email = 'viliam.simko@gmail.com', role = 'aut'),
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
YEAR: 2010-2021
YEAR: 2010-2024
COPYRIGHT HOLDER: Capital of Statistics, http://cosx.org/
9 changes: 8 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
# corrplot 0.94
# corrplot 0.95

## Changes

* Fix #279: Version 0.94 is not assigning significant ocurrences correctly. (thanks, @brenoliisboa and @david-priest)


# corrplot 0.94

## Changes

Expand Down
9 changes: 5 additions & 4 deletions R/corrplot.R
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
#' \code{length(col) + 1} when \code{length(col) <=20}; \code{cl.length} is 11
#' when \code{length(col) > 20}
#'
#' @param cl.cex Numeric, cex of number-label in color-legend, passed to
#' @param cl.cex Numeric, text size of number-label in color-legend, passed to
#' \code{\link{colorlegend}}.
#'
#' @param cl.ratio Numeric, to justify the width of color-legend, 0.1~0.2 is
Expand Down Expand Up @@ -453,6 +453,10 @@ corrplot = function(corr,
if (order != 'original') {
ord = corrMatOrder(corr, order = order, hclust.method = hclust.method)
corr = corr[ord, ord]

if (!is.null(p.mat)) {
p.mat = p.mat[ord, ord]
}
}

## set up variable names
Expand Down Expand Up @@ -897,9 +901,6 @@ corrplot = function(corr,


if (!is.null(p.mat) && insig != 'n') {
if (order != 'original') {
p.mat = p.mat[ord, ord]
}

if(!is.null(rownames(p.mat)) | !is.null(rownames(p.mat))) {
if(!all(colnames(p.mat)==colnames(corr)) |
Expand Down
2 changes: 1 addition & 1 deletion man/corrplot.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 0818eb6

Please sign in to comment.