Skip to content

Commit

Permalink
Merge branch 'release-0.6.11'
Browse files Browse the repository at this point in the history
  • Loading branch information
MatthewHeun committed Jan 17, 2025
2 parents c0348e5 + 110ca3b commit 2d638bf
Show file tree
Hide file tree
Showing 216 changed files with 6,668 additions and 6,151 deletions.
8 changes: 4 additions & 4 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: matsbyname
Type: Package
Title: An Implementation of Matrix Mathematics that Respects Row and Column Names
Version: 0.6.10
Date: 2024-02-12
Version: 0.6.11
Date: 2025-01-17
Authors@R: c(person("Matthew", "Heun", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-7438-214X"),
email = "[email protected]"))
Expand All @@ -11,11 +11,11 @@ Description: An implementation of matrix mathematics wherein operations are perf
License: MIT + file LICENSE
Language: en-US
Encoding: UTF-8
RoxygenNote: 7.3.1
RoxygenNote: 7.3.2
Roxygen: list(markdown = TRUE)
Config/testthat/edition: 3
Config/testthat/parallel: true
Config/testthat/start-first: Binary, Utilities, Unary
Config/testthat/start-first: Unary, Utilities, Binary
Imports:
assertthat,
dplyr,
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
YEAR: 2024
YEAR: 2025
COPYRIGHT HOLDER: matsbyname authors
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# MIT License

Copyright (c) 2024 matsbyname authors
Copyright (c) 2025 matsbyname authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 4 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export(pow_byname)
export(prep_vector_arg)
export(prodall_byname)
export(quotient_byname)
export(reallocate_byname)
export(rename_to_piece_byname)
export(rename_to_pref_suff_byname)
export(replaceNaN_byname)
Expand All @@ -77,6 +78,7 @@ export(samestructure_byname)
export(select_cols_byname)
export(select_rowcol_piece_byname)
export(select_rows_byname)
export(select_rows_cols_byname)
export(selectzerocols_byname)
export(selectzerorows_byname)
export(setcolnames_byname)
Expand All @@ -88,6 +90,8 @@ export(sum_byname)
export(sumall_byname)
export(svd_byname)
export(switch_notation_byname)
export(to_named_matrix)
export(to_triplet)
export(transpose_byname)
export(trim_rows_cols)
export(unaryapply_byname)
Expand Down
30 changes: 29 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,39 @@ title: "Release notes for `matsbyname`"
output: html_document
---


Cite all releases with doi [10.5281/zenodo.5118872](https://doi.org/10.5281/zenodo.5118872),
which always resolves to the latest release.


## matsbyname 0.6.10 (2024-02-12)
## matsbyname 0.6.11 (2025-01-17)

* Fixed a bug in `to_named_matrix()`, which previously
errored when a matrix with any `NA` values was passed in the `a` argument.
* Documented the behaviour of `iszero_byname()` when
a matrix has any `NA` elements:
the result is `NA`.
* Added function `reallocate_byname()` to reallocate a
row or column proportionally to other rows or columns.
* Change default name of value column in `to_triplet()`
from "x" to "value".
* New function `select_rows_cols_byname()` includes `margin` argument
that de-references row and column types, as needed.
* New functions `to_triplet()` and `to_named_matrix()`
convert between named matrix and triplet forms
(both integer triplet and character triplet)
of matrices
to assist some database operations
(which prefer integer triplet form).
* Fixed a bug where setting rowtype or coltype attributes on a
data frame resulted in the attribute set on each column
of the data frame.
* New tests for new features.
- Now up to 2175 tests, all passing.
- Test coverage remains at 100%.


## matsbyname 0.6.10 (2024-02-12) [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.10652382.svg)](https://doi.org/10.5281/zenodo.10652382)

* Now skipping speed tests on CRAN.
These tests are appropriate only for certain machines
Expand Down
3 changes: 3 additions & 0 deletions R/Unary.R
Original file line number Diff line number Diff line change
Expand Up @@ -1388,6 +1388,9 @@ replaceNaN_byname <- function(a, val = 0){
trip <- Matrix::mat2triplet(a_mat) %>%
as.data.frame() %>%
# Find rows in the triple that are NaN
# Note that "x" is the name of the value column produced by
# Matrix::mat2triplet().
# We can't change it!
dplyr::filter(is.nan(.data[["x"]]))
# Set those values to val
if (nrow(trip) > 0) {
Expand Down
Loading

0 comments on commit 2d638bf

Please sign in to comment.