Skip to content

Commit

Permalink
Merge pull request #75 from rgcca-factory/fix_ncol_null
Browse files Browse the repository at this point in the history
Apply fix to not rely on NCOL(NULL) anymore
  • Loading branch information
Tenenhaus authored Dec 11, 2023
2 parents 5233a8c + 85d5335 commit 17347b7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Type: Package
Package: RGCCA
Title: Regularized and Sparse Generalized Canonical Correlation
Analysis for Multiblock Data
Version: 3.0.2
Version: 3.0.3
Authors@R: c(
person("Fabien", "Girka", role = "aut"),
person("Etienne", "Camenen", role = "aut"),
Expand Down
3 changes: 2 additions & 1 deletion R/set_parameter_grid.R
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ set_parameter_grid <- function(par_type, par_length, par_value, blocks,
"following: NULL, a vector, a matrix or a dataframe."
)
}
is_valid_shape <- (NCOL(par_value) == 1) ||
is_valid_shape <- is.null(par_value) ||
(NCOL(par_value) == 1) ||
(NCOL(par_value) == J) ||
((NCOL(par_value) == J + 1) && superblock)
if (!is_valid_shape) {
Expand Down
8 changes: 4 additions & 4 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
"codeRepository": "https://github.com/rgcca-factory/RGCCA",
"issueTracker": "https://github.com/rgcca-factory/RGCCA/issues",
"license": "https://spdx.org/licenses/GPL-3.0",
"version": "3.0.2",
"version": "3.0.3",
"programmingLanguage": {
"@type": "ComputerLanguage",
"name": "R",
"url": "https://r-project.org"
},
"runtimePlatform": "R version 4.2.3 (2023-03-15 ucrt)",
"runtimePlatform": "R version 4.3.0 (2023-04-21)",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand Down Expand Up @@ -311,7 +311,7 @@
},
"SystemRequirements": null
},
"fileSize": "57390.932KB",
"fileSize": "1237.747KB",
"citation": [
{
"@type": "SoftwareSourceCode",
Expand Down Expand Up @@ -354,7 +354,7 @@
],
"name": "{RGCCA}: Regularized and Sparse Generalized Canonical Correlation Analysis for Multiblock Data",
"url": "https://CRAN.R-project.org/package=RGCCA",
"description": "R package version 3.0.2"
"description": "R package version 3.0.3"
}
],
"releaseNotes": "https://github.com/rgcca-factory/RGCCA/blob/main/NEWS.md",
Expand Down

0 comments on commit 17347b7

Please sign in to comment.