Skip to content

Commit 90f5d2f

Browse files
Martin Maechlercran-robot
authored andcommitted
version 1.6-4
1 parent 23d9d53 commit 90f5d2f

21 files changed

Lines changed: 373 additions & 83 deletions

DESCRIPTION

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Package: Matrix
2-
Version: 1.6-3
2+
Version: 1.6-4
33
VersionNote: do also bump src/version.h, inst/include/Matrix/version.h
4-
Date: 2023-11-13
4+
Date: 2023-11-29
55
Priority: recommended
66
Title: Sparse and Dense Matrix Classes and Methods
77
Description: A rich hierarchy of sparse and dense matrix classes,
@@ -42,7 +42,7 @@ LazyDataNote: not possible, since we use data/*.R and our S4 classes
4242
BuildResaveData: no
4343
Encoding: UTF-8
4444
NeedsCompilation: yes
45-
Packaged: 2023-11-13 10:16:52 UTC; maechler
45+
Packaged: 2023-11-29 11:39:01 UTC; maechler
4646
Author: Douglas Bates [aut] (<https://orcid.org/0000-0001-8316-9503>),
4747
Martin Maechler [aut, cre] (<https://orcid.org/0000-0002-8685-9910>),
4848
Mikael Jagan [aut] (<https://orcid.org/0000-0002-3542-2938>),
@@ -57,4 +57,4 @@ Author: Douglas Bates [aut] (<https://orcid.org/0000-0001-8316-9503>),
5757
R Core Team [ctb] (base R's matrix implementation)
5858
Maintainer: Martin Maechler <mmaechler+Matrix@gmail.com>
5959
Repository: CRAN
60-
Date/Publication: 2023-11-14 11:55:00 UTC
60+
Date/Publication: 2023-11-30 14:40:02 UTC

MD5

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
8d0a8862e6720381f6ad91b701530940 *DESCRIPTION
1+
7fbf568b1b24e45846e0d28ae1d50252 *DESCRIPTION
22
7866cc186e8ad4d6a243c271f64c13fc *LICENCE
33
ba6604808100abfe8137ad02b0a04f22 *NAMESPACE
44
d641435295187325a3663988363105bb *R/AllClass.R
@@ -49,37 +49,37 @@ ee9131172b092aab5fe5cf65c31e7a3c *R/sparseVector.R
4949
1d53662e289e483d4b47531e31bbfd58 *R/subassign.R
5050
652621c4dfe1d178c7d0b6dd6094d2ad *R/subscript.R
5151
4e983e0d3d1a87f0e9058bc9cf0b6143 *R/which.R
52-
69f3cdbddc841fd0b984e9b2ebc9f088 *R/zzz.R
53-
67e0005a66bf87e12c1179b435c1f581 *build/Matrix.pdf
54-
8c1f231b6be2a509e34ac857a0de43bb *build/stage23.rdb
52+
6aea1683207a30bf610a1ae64adc52df *R/zzz.R
53+
5b424f3b7f741e98ba667409b29012b7 *build/Matrix.pdf
54+
a2c355970cb12d2031aec252e3c2ca41 *build/stage23.rdb
5555
75b445cb0f3b5549d3132a7236c6d050 *build/vignette.rds
5656
afeec9c25bf3c232f8567ee3f27cf0f6 *cleanup
5757
9f8e37cf17a5d4811d0c28f07148cf7d *data/CAex.R
5858
c60c038f2c6d15c5303d81330991c838 *data/KNex.R
5959
d6193dad1031a61ebc3d3e38fabd252d *data/USCounties.R
6060
0d65337740b3914f535239cbe6e8a2df *data/datalist
6161
a40150a1c71deabec67e61af2b8f7e38 *data/wrld_1deg.R
62-
4678b4ef31bd6f9be39ebf701d1890e4 *inst/NEWS.Rd
62+
3a0b96ca548d6fd264b4107b6238daa2 *inst/NEWS.Rd
6363
d1092f2de709b554fb06b516ee00a885 *inst/doc/Comparisons.R
6464
f6c9e4986022f1db4c085b8429d06fca *inst/doc/Comparisons.Rnw
65-
d75c29b6d6251ceb575f3f0e4261e9dd *inst/doc/Comparisons.pdf
65+
aec5a46e9bae67854d1ad0f5c5f563c1 *inst/doc/Comparisons.pdf
6666
3f45bdb5515081392d14b87f4770cb2b *inst/doc/Design-issues.R
6767
2bd2896847fb11eaf102158b8696c884 *inst/doc/Design-issues.Rnw
68-
fd610ec99b3062e078d6b2759b5fcd67 *inst/doc/Design-issues.pdf
68+
beab9e28e7dd9c4e9a0623309baf9802 *inst/doc/Design-issues.pdf
6969
3f87d045a10e0afc85a3385bab8f215b *inst/doc/Intro2Matrix.R
7070
448278dab638a78df6eb59270772cbe2 *inst/doc/Intro2Matrix.Rnw
71-
713681f1b9329d8b6e2761390e3abaee *inst/doc/Intro2Matrix.pdf
71+
f038a601ec1338f9144cd66121e3d68c *inst/doc/Intro2Matrix.pdf
7272
1a59a7d3257a30349a5e10285ea05a69 *inst/doc/Introduction.R
7373
c39a26dfe7ccaafd044e88468155b153 *inst/doc/Introduction.Rnw
74-
82679e83e76c810b5b28664d8eef82fb *inst/doc/Introduction.pdf
74+
178a06274d9cd500d268a27a7aa285e6 *inst/doc/Introduction.pdf
7575
20ced7019f5a55639aa1af1a2dfa1057 *inst/doc/SuiteSparse/AMD.txt
7676
facc21d5bf9bcbf3e57a8b3c7bd1caa0 *inst/doc/SuiteSparse/CHOLMOD.txt
7777
a6693872cf6e74e758f3fa327c606fec *inst/doc/SuiteSparse/COLAMD.txt
7878
d75882d4bb768ba0ea352291652daaee *inst/doc/SuiteSparse/SPQR.txt
7979
c7da19803d926fe0e3604c08bedfb3c5 *inst/doc/SuiteSparse/SuiteSparse_config.txt
8080
e4e486aee6a99cb21909bb6de32db68d *inst/doc/sparseModels.R
8181
813e0c8cc7a5f7ecff43e5882270a431 *inst/doc/sparseModels.Rnw
82-
be62d49a7f8fb435243178f3f04b4929 *inst/doc/sparseModels.pdf
82+
9e01f1c7d2e97f9af2ddc56b469d7b69 *inst/doc/sparseModels.pdf
8383
dcd11f6947f910f743254824e930b2c7 *inst/external/CAex_slots.rda
8484
be886d6bb832210bb654b9ad064fe0ff *inst/external/KNex_slots.rda
8585
90f019ec81e67d7f3542f7ca39bf3f2d *inst/external/USCounties_slots.rda
@@ -97,11 +97,11 @@ ca51a0b8b76e7ea3e7881cc8da1390b1 *inst/external/wrld_1deg_slots.rda
9797
9a7e9eac66c8e2e4f302ef50e52e7a56 *inst/include/Matrix.h
9898
393d17634a64d5414c62d83cb4b05764 *inst/include/Matrix/Matrix.h
9999
a8f80507036f68ab0180c36e4d874abd *inst/include/Matrix/alloca.h
100-
32910f8f19d3a18bad0c5ab170cd3b0e *inst/include/Matrix/cholmod-utils.h
100+
9453d69ed641a1842043a4b28b677784 *inst/include/Matrix/cholmod-utils.h
101101
573270a60b73ad502ab087e00bb22d91 *inst/include/Matrix/cholmod.h
102-
a31e55cd9a1f668102dcf38b335eb134 *inst/include/Matrix/remap.h
103-
fedfc6bfec2247c1933a7bdf9bdce4df *inst/include/Matrix/stubs.c
104-
6bf71f44c24df06c5896443a5e5c09a8 *inst/include/Matrix/version.h
102+
851b528969721a8bfa532fd9ec412642 *inst/include/Matrix/remap.h
103+
64edf49b9299a18f62e9a6fa4a8a7565 *inst/include/Matrix/stubs.c
104+
de356b05a21483e22a5226acb250b5b0 *inst/include/Matrix/version.h
105105
7d96680b80f7792dda638a3900abab51 *inst/include/Matrix_stubs.c
106106
521f406135ff54057933d9a152482ec7 *inst/include/cholmod.h
107107
f16fb9f317d02aa9f4b0423532a2826c *inst/po/de/LC_MESSAGES/Matrix.mo
@@ -394,8 +394,8 @@ adf54d07a4c37305f145130c06afaeba *src/abIndex.c
394394
f957aa1decb3ab62e5768873dacbd08d *src/attrib.h
395395
2c5fba5b2b59e716446291cf65d1beaa *src/bind.c
396396
ae9faa18a9b4d9e424979c2c8018c110 *src/bind.h
397-
865b0daf858338af3231b064e1899023 *src/chm_common.c
398-
25dadcb67b993d6c9c21bc5f5d05ff46 *src/chm_common.h
397+
b73e6fe8f3d6555f28bbe9342351f58f *src/chm_common.c
398+
24051279363b37a028c285c20946d43d *src/chm_common.h
399399
0b8e6dc7c39c678e1d9b63a75e95555a *src/cholmod-etc.c
400400
c5b0558d153b6934275104fa21a43013 *src/cholmod-etc.h
401401
a9604ad03ae7eb048de303d9a2d57fe2 *src/coerce.c
@@ -416,7 +416,7 @@ eb3f4325b448c588de89782c3ac6d8c8 *src/dgeMatrix.h
416416
e8265b2a487f2c17ab46a4bba3c4fbb9 *src/factorizations.h
417417
3a00ec0197947e526799ddef28b9f265 *src/idz.c
418418
0b015211a474aa369610621fd3c543c2 *src/idz.h
419-
03441ca2803b03b51ed010338b4578ae *src/init.c
419+
4c779a68105eedc86992df6b72f8e221 *src/init.c
420420
15d79a179e59c135b44f5967efd8d90f *src/kappa.c
421421
6204a5bcb90a0715baf19669ef9eb940 *src/kappa.h
422422
9bc0932a84ef35921138ccb7e22112d3 *src/objects.c
@@ -435,15 +435,15 @@ e63b80a881df16e35711cd6dfbb56d0b *src/sparseVector.c
435435
024ab3a6d182f9f3e585b802c6e43661 *src/sparseVector.h
436436
239a1593560fe15f100577b5f81814b2 *src/subscript.c
437437
5801e16aa00d9d5188f34e7270057e3b *src/subscript.h
438-
ed9a22e450a45f8ab7ecbb5ebf47a06d *src/t_Csparse_subassign.c
438+
bf38710f2a1be89c059d0d0c62b9327d *src/t_Csparse_subassign.c
439439
9542b498b327ff7c9345ed5df2b9fc01 *src/t_Matrix_rle.c
440-
63f21d666296603d235f68c8f7909868 *src/utils-R.c
440+
d1e9d8b116fdc339313a6d2d63f58e5b *src/utils-R.c
441441
46f34227d88921a56c0eb1e5ce4f17ac *src/utils-R.h
442442
7dd32b8add5da5db098536fd6323bfdd *src/utils.c
443443
a819313eb7f9d3c3fc57990d6022b076 *src/utils.h
444444
68452519a0af12ef44ae93e39afb50e0 *src/validity.c
445445
9488bc95eb18488965cc74af6674cd76 *src/validity.h
446-
ed6c934753e947c5d10edf58c29570fb *src/version.h
446+
88bb90cbbb18710f0ecb563e0dcf1846 *src/version.h
447447
242ec9448d48cc231d1369448e310018 *tests/Class+Meth.R
448448
6d046b4f202bc199400b4d5f02f8afd4 *tests/Simple.R
449449
5e53e6b4552a116eb3a0d6d2feff0105 *tests/abIndex-tsts.R

R/zzz.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Matrix.Version <- function() {
120120
## ~~~~ DEPRECATED ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
121121

122122
..2dge <- function(from) {
123-
.Deprecated(new = ".M2gen", package = "Matrix")
123+
.Deprecated(new = ".M2gen(*, \"d\") or .m2dense(*, \"dge\")", package = "Matrix")
124124
if(isS4(from))
125125
.M2gen(from, "d")
126126
else .m2dense(from, "dge")

build/Matrix.pdf

0 Bytes
Binary file not shown.

build/stage23.rdb

3 Bytes
Binary file not shown.

inst/NEWS.Rd

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,23 @@
44
\title{News for \R{} Package \pkg{Matrix}}
55
\encoding{UTF-8}
66
%% NB: The date (yyyy-mm-dd) is the "Packaged: " date in ../DESCRIPTION
7+
\section{Changes in version 1.6-4 (2023-11-29 r4523)}{
8+
\subsection{Bug Fixes}{
9+
\itemize{
10+
\item \code{printf} format mismatches detected by R-devel
11+
are fixed in 3 \file{src/*.c}.
12+
\item better deprecation message for \code{..2dge()}.
13+
}
14+
}
15+
\subsection{Misc}{
16+
\itemize{
17+
\item Entry point \code{M_chm_triplet_to_SEXP}, removed
18+
in \pkg{Matrix} version 1.6-2, is restored (as a macro).
19+
It was \dQuote{covertly} used by package \pkg{Rmosek}.
20+
}
21+
}
22+
}
23+
724
\section{Changes in version 1.6-3 (2023-11-13 r4513)}{
825
\subsection{Misc}{
926
\itemize{

inst/doc/Comparisons.pdf

41 Bytes
Binary file not shown.

inst/doc/Design-issues.pdf

-68 Bytes
Binary file not shown.

inst/doc/Intro2Matrix.pdf

84 Bytes
Binary file not shown.

inst/doc/Introduction.pdf

89 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)