Binary files /tmp/tmpwn_J0u/_srmOP_YoJ/r-cran-rrcov-1.5-2/build/vignette.rds and /tmp/tmpwn_J0u/RFmiVlckfe/r-cran-rrcov-1.5-5/build/vignette.rds differ diff -Nru r-cran-rrcov-1.5-2/ChangeLog r-cran-rrcov-1.5-5/ChangeLog --- r-cran-rrcov-1.5-2/ChangeLog 2020-01-14 15:55:07.000000000 +0000 +++ r-cran-rrcov-1.5-5/ChangeLog 2020-07-31 22:28:06.000000000 +0000 @@ -1,11 +1,23 @@ +2020-07-31 Valentin Todorov + * + * DESCRIPTION (Version): 1.5-5 + * + * R/PcaHubert.R - PcaHubert will crash if X is 1-dimensional and mcd=FALSE: fixed + * R/PcaProj.R - fixed a problem with wrong scores (reported by Matthieu Lesnoff ) + * R/CovMve.R, CovSest.R - fixed a problem with nsamp="exact" or nsamp="best" + * (reported by Claudio Agostinelli) - these functions, differently from CovMcd, + * should not take non-numeric 'nsamp' + * tests/tlda.R, togk4.R: fixed 'noLD' issues in tlda.R and okg4.R + * + 2020-01-14 Valentin Todorov * * DESCRIPTION (Version): 1.5-2 * * R/getEllipse.R - Removed the dependence on packages 'cluster' and 'ellipse' - * R/Linda - added parameter 'control' to select the robust location and + * R/Linda - added parameter 'control' to select the robust location and * covariance estimator to use in LDA. Now any estimator derived from class 'Cov' - * can be used, even such that are not in 'rrcov'. Return this parameter in the + * can be used, even such that are not in 'rrcov'. Return this parameter in the * returned S4 object. * * R/Linda - return the location and covariance estimator used as 'covobj'. This @@ -13,10 +25,10 @@ * * R/Lda.R - fixed an issue in predict function * - * R/LdaClassic, R/Linda - use generalized inverse if the common covariance + * R/LdaClassic, R/Linda - use generalized inverse if the common covariance * matrix is singular. * - + 2019-11-25 Valentin Todorov * * DESCRIPTION (Version): 1.4-9 diff -Nru r-cran-rrcov-1.5-2/debian/changelog r-cran-rrcov-1.5-5/debian/changelog --- r-cran-rrcov-1.5-2/debian/changelog 2020-05-30 16:46:56.000000000 +0000 +++ r-cran-rrcov-1.5-5/debian/changelog 2020-09-04 09:44:04.000000000 +0000 @@ -1,8 +1,11 @@ -r-cran-rrcov (1.5-2-1build1) groovy; urgency=medium +r-cran-rrcov (1.5-5-1) unstable; urgency=medium - * No-change rebuild against r-api-4.0 + * Team upload. + * New upstream version + * debhelper-compat 13 (routine-update) + * Rules-Requires-Root: no (routine-update) - -- Graham Inggs Sat, 30 May 2020 16:46:56 +0000 + -- Andreas Tille Fri, 04 Sep 2020 11:44:04 +0200 r-cran-rrcov (1.5-2-1) unstable; urgency=medium diff -Nru r-cran-rrcov-1.5-2/debian/control r-cran-rrcov-1.5-5/debian/control --- r-cran-rrcov-1.5-2/debian/control 2020-01-24 10:51:41.000000000 +0000 +++ r-cran-rrcov-1.5-5/debian/control 2020-09-04 09:44:04.000000000 +0000 @@ -4,7 +4,7 @@ Section: gnu-r Testsuite: autopkgtest-pkg-r Priority: optional -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), dh-r, r-base-dev, r-cran-robustbase (>= 0.92.1), @@ -15,6 +15,7 @@ Vcs-Browser: https://salsa.debian.org/r-pkg-team/r-cran-rrcov Vcs-Git: https://salsa.debian.org/r-pkg-team/r-cran-rrcov.git Homepage: https://cran.r-project.org/package=rrcov +Rules-Requires-Root: no Package: r-cran-rrcov Architecture: any diff -Nru r-cran-rrcov-1.5-2/DESCRIPTION r-cran-rrcov-1.5-5/DESCRIPTION --- r-cran-rrcov-1.5-2/DESCRIPTION 2020-01-16 18:40:06.000000000 +0000 +++ r-cran-rrcov-1.5-5/DESCRIPTION 2020-08-03 15:30:02.000000000 +0000 @@ -1,9 +1,9 @@ Package: rrcov -Version: 1.5-2 -Date: 2020-01-14 -VersionNote: Released 1.4-9 on 2019-11-25 on CRAN +Version: 1.5-5 +Date: 2020-07-31 +VersionNote: Released 1.5-2 on 2020-01-16 on CRAN Title: Scalable Robust Estimators with High Breakdown Point -Author: Valentin Todorov +Authors@R: c(person("Valentin", "Todorov", role = c("aut", "cre"), email = "valentin.todorov@chello.at", comment=c(ORCID = "0000-0003-4215-0245"))) Description: Robust Location and Scatter Estimation and Robust Multivariate Analysis with High Breakdown Point: principal component analysis (Filzmoser and Todorov (2013), ), @@ -20,6 +20,7 @@ LazyLoad: yes License: GPL (>= 2) Repository: CRAN -Packaged: 2020-01-14 16:21:56 UTC; todorovv +Packaged: 2020-07-31 22:53:37 UTC; Share NeedsCompilation: yes -Date/Publication: 2020-01-16 18:40:06 UTC +Author: Valentin Todorov [aut, cre] () +Date/Publication: 2020-08-03 15:30:02 UTC diff -Nru r-cran-rrcov-1.5-2/inst/Citation r-cran-rrcov-1.5-5/inst/Citation --- r-cran-rrcov-1.5-2/inst/Citation 1970-01-01 00:00:00.000000000 +0000 +++ r-cran-rrcov-1.5-5/inst/Citation 2016-09-06 10:48:49.000000000 +0000 @@ -0,0 +1,21 @@ +citHeader("To cite rrcov in publications use:") + +citEntry(entry = "Article", + title = "An Object-Oriented Framework for Robust Multivariate Analysis", + author = personList(as.person("Valentin Todorov"), + as.person("Peter Filzmoser")), + journal = "Journal of Statistical Software", + year = "2009", + volume = "32", + number = "3", + pages = "1--47", + url = "http://www.jstatsoft.org/v32/i03/", + + textVersion = + paste("Valentin Todorov, Peter Filzmoser (2009).", + "An Object-Oriented Framework for Robust Multivariate Analysis.", + "Journal of Statistical Software, 32(3), 1-47.", + "URL http://www.jstatsoft.org/v32/i03/.") +) + + diff -Nru r-cran-rrcov-1.5-2/inst/CITATION r-cran-rrcov-1.5-5/inst/CITATION --- r-cran-rrcov-1.5-2/inst/CITATION 2016-09-06 10:48:49.000000000 +0000 +++ r-cran-rrcov-1.5-5/inst/CITATION 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -citHeader("To cite rrcov in publications use:") - -citEntry(entry = "Article", - title = "An Object-Oriented Framework for Robust Multivariate Analysis", - author = personList(as.person("Valentin Todorov"), - as.person("Peter Filzmoser")), - journal = "Journal of Statistical Software", - year = "2009", - volume = "32", - number = "3", - pages = "1--47", - url = "http://www.jstatsoft.org/v32/i03/", - - textVersion = - paste("Valentin Todorov, Peter Filzmoser (2009).", - "An Object-Oriented Framework for Robust Multivariate Analysis.", - "Journal of Statistical Software, 32(3), 1-47.", - "URL http://www.jstatsoft.org/v32/i03/.") -) - - Binary files /tmp/tmpwn_J0u/_srmOP_YoJ/r-cran-rrcov-1.5-2/inst/doc/rrcov.pdf and /tmp/tmpwn_J0u/RFmiVlckfe/r-cran-rrcov-1.5-5/inst/doc/rrcov.pdf differ diff -Nru r-cran-rrcov-1.5-2/inst/NEWS.Rd r-cran-rrcov-1.5-5/inst/NEWS.Rd --- r-cran-rrcov-1.5-2/inst/NEWS.Rd 2020-01-14 15:55:06.000000000 +0000 +++ r-cran-rrcov-1.5-5/inst/NEWS.Rd 2020-07-31 22:27:58.000000000 +0000 @@ -4,16 +4,33 @@ \title{News for \R Package \pkg{rrcov}} \encoding{UTF-8} -\section{CHANGES in rrcov VERSION 1.4-7 (2018-11-14)}{ +\section{CHANGES in rrcov VERSION 1.5-5 (2020-07-31)}{ + \subsection{BUG FIXES}{ + \itemize{ + \item PcaHubert will crash if X is 1-dimensional and mcd=FALSE: fixed. + \item Fixed 'noLD' issues in tlda.R and okg4.R + \item Fixed a problem with wrong scores in PcaProj() (reported by Matthieu Lesnoff ) + \item Fixed a problem with nsamp="exact" or nsamp="best" in CovMve(), CovSest() (reported by Claudio Agostinelli) - + these functions, differently from CovMcd, should not take non-numeric 'nsamp' + } + } +} +\section{CHANGES in rrcov VERSION 1.5-2 (2020-01-14)}{ \subsection{NEW FEATURES}{ \itemize{ - \item Added Minimum Regularized Covariance Determinant estimator (MRCD) - (Boudt et al. 2018) - - functions \code{CovMrcd()} and \code{CovControlMrcd()} - - \item Added data set \code{octane}; data set \code{olitos} from package rrcovHD moved here. - - \item The 'pairs' plot is now available for classical covariance matrix + \item Added parameter 'control' to Linda - to select the robust location and + covariance estimator to use in LDA. Now any estimator derived from class 'Cov' + can be used, even such that are not in 'rrcov'. Return this parameter in the + returned S4 object. + \item Linda returns now the location and covariance estimator used as 'covobj'. This + is useful for controlling cross-validation, for example. + \item Linda and LdaClassic use generalized inverse if the common covariance matrix is singular. + } + } + \subsection{BUG FIXES}{ + \itemize{ + \item Fixed an issue the 'predict' function. + \item Removed the dependence on packages 'cluster' and 'ellipse'. } } } @@ -34,22 +51,16 @@ } } } -\section{CHANGES in rrcov VERSION 1.5-2 (2020-01-14)}{ +\section{CHANGES in rrcov VERSION 1.4-7 (2018-11-14)}{ \subsection{NEW FEATURES}{ \itemize{ - \item Added parameter 'control' to Linda - to select the robust location and - covariance estimator to use in LDA. Now any estimator derived from class 'Cov' - can be used, even such that are not in 'rrcov'. Return this parameter in the - returned S4 object. - \item Linda returns now the location and covariance estimator used as 'covobj'. This - is useful for controlling cross-validation, for example. - \item Linda and LdaClassic use generalized inverse if the common covariance matrix is singular. - } - } - \subsection{BUG FIXES}{ - \itemize{ - \item Fixed an issue the 'predict' function. - \item Removed the dependence on packages 'cluster' and 'ellipse'. + \item Added Minimum Regularized Covariance Determinant estimator (MRCD) + (Boudt et al. 2018) - + functions \code{CovMrcd()} and \code{CovControlMrcd()} + + \item Added data set \code{octane}; data set \code{olitos} from package rrcovHD moved here. + + \item The 'pairs' plot is now available for classical covariance matrix } } } diff -Nru r-cran-rrcov-1.5-2/man/Appalachia.Rd r-cran-rrcov-1.5-5/man/Appalachia.Rd --- r-cran-rrcov-1.5-2/man/Appalachia.Rd 2016-09-06 10:48:49.000000000 +0000 +++ r-cran-rrcov-1.5-5/man/Appalachia.Rd 2020-07-28 21:01:55.000000000 +0000 @@ -32,10 +32,8 @@ } \references{ Neykov, N.M., Neytchev, P.N., Van Gelder, P.H.A.J.M. and Todorov V. (2007), - Robust detection of discordant sites in regional frequency analysis, - \emph{Water Resources Research}, 43, W06417, - doi:10.1029/2006WR005322, - \url{http://www.agu.org/pubs/crossref/2007/2006WR005322.shtml} + Robust detection of discordant sites in regional frequency analysis, + \emph{Water Resources Research}, 43, W06417, doi:10.1029/2006WR005322 } \examples{ data(Appalachia) diff -Nru r-cran-rrcov-1.5-2/man/Cascades.Rd r-cran-rrcov-1.5-5/man/Cascades.Rd --- r-cran-rrcov-1.5-2/man/Cascades.Rd 2016-09-06 10:48:49.000000000 +0000 +++ r-cran-rrcov-1.5-5/man/Cascades.Rd 2020-07-28 21:02:54.000000000 +0000 @@ -31,10 +31,8 @@ } \references{ Neykov, N.M., Neytchev, P.N., Van Gelder, P.H.A.J.M. and Todorov V. (2007), - Robust detection of discordant sites in regional frequency analysis, - \emph{Water Resources Research}, 43, W06417, - doi:10.1029/2006WR005322, - \url{http://www.agu.org/pubs/crossref/2007/2006WR005322.shtml} + Robust detection of discordant sites in regional frequency analysis, + \emph{Water Resources Research}, 43, W06417, doi:10.1029/2006WR005322 } \examples{ data(Cascades) diff -Nru r-cran-rrcov-1.5-2/man/lmom32.Rd r-cran-rrcov-1.5-5/man/lmom32.Rd --- r-cran-rrcov-1.5-2/man/lmom32.Rd 2016-09-06 10:48:49.000000000 +0000 +++ r-cran-rrcov-1.5-5/man/lmom32.Rd 2020-07-28 21:02:52.000000000 +0000 @@ -32,10 +32,8 @@ } \references{ Neykov, N.M., Neytchev, P.N., Van Gelder, P.H.A.J.M. and Todorov V. (2007), - Robust detection of discordant sites in regional frequency analysis, - \emph{Water Resources Research}, 43, W06417, - doi:10.1029/2006WR005322, - \url{http://www.agu.org/pubs/crossref/2007/2006WR005322.shtml} + Robust detection of discordant sites in regional frequency analysis, + \emph{Water Resources Research}, 43, W06417, doi:10.1029/2006WR005322 } \examples{ data(lmom32) diff -Nru r-cran-rrcov-1.5-2/man/lmom33.Rd r-cran-rrcov-1.5-5/man/lmom33.Rd --- r-cran-rrcov-1.5-2/man/lmom33.Rd 2016-09-06 10:48:49.000000000 +0000 +++ r-cran-rrcov-1.5-5/man/lmom33.Rd 2020-07-28 21:03:05.000000000 +0000 @@ -32,10 +32,8 @@ } \references{ Neykov, N.M., Neytchev, P.N., Van Gelder, P.H.A.J.M. and Todorov V. (2007), - Robust detection of discordant sites in regional frequency analysis, - \emph{Water Resources Research}, 43, W06417, - doi:10.1029/2006WR005322, - \url{http://www.agu.org/pubs/crossref/2007/2006WR005322.shtml} + Robust detection of discordant sites in regional frequency analysis, + \emph{Water Resources Research}, 43, W06417, doi:10.1029/2006WR005322 } \examples{ data(lmom33) diff -Nru r-cran-rrcov-1.5-2/MD5 r-cran-rrcov-1.5-5/MD5 --- r-cran-rrcov-1.5-2/MD5 2020-01-16 18:40:07.000000000 +0000 +++ r-cran-rrcov-1.5-5/MD5 2020-08-03 15:30:03.000000000 +0000 @@ -1,5 +1,5 @@ -3e58c27a78717694ed6588866cff6485 *ChangeLog -c71c126ed1f8ffd11cb2278a7cc9f78f *DESCRIPTION +58f1a6886540ab687e6779903d16e83f *ChangeLog +cffdc8b0aaa727f55630d082488ca227 *DESCRIPTION 45bdb0c2375c6fdf31a4c222a649f551 *NAMESPACE ce701b02810d7e088273e45ada6b9010 *R/AllClasses.R 2621b703a070a9cd1b9ca2b755e763d4 *R/AllGenerics.R @@ -10,11 +10,11 @@ f67189295e5bc982dc78ccfa6655e443 *R/CovMcd.R 7e71f38495389ced9e788151c196fe4a *R/CovMest.R 0bfe6fd9084c3f46acd7d80fd1f6aaad *R/CovMrcd.R -9544d6ab30f55290886cffe34b6ea3b5 *R/CovMve.R +e77a9543db99d9d22930bafdee807235 *R/CovMve.R e37a6bf70cfc6570731adafd7a6e8105 *R/CovOgk.R 0c633130bb04693e28191981e929f732 *R/CovRobust.R 574a90e594f83533862c70c3fb1e1ff9 *R/CovSde.R -3c54ba7ac0de81bcb7773ae3cbf240a3 *R/CovSest.R +906091b55297c88c4ecf65f1fe3ad3bc *R/CovSest.R 68c34b29dbfcf037efb45906f24b0f2c *R/Lda.R 6e9c08123c0cfb08471de32222065527 *R/LdaClassic.R 79e8c4f4ace04e529a247dc34aaa8178 *R/LdaPP.R @@ -23,9 +23,9 @@ 0d309301e37d516bef369d9f36cebfb9 *R/PcaClassic.R 75d874c217f0135057c99e74465e6a52 *R/PcaCov.R 139fcd1d9e94a6c479452fcf85652158 *R/PcaGrid.R -5a06f0ce83acbf982fe3a9e75200bc86 *R/PcaHubert.R +2c6263cc4b84502c86b28df8104a0663 *R/PcaHubert.R 11689ed5e05d9c267bbb940dbaf9d312 *R/PcaLocantore.R -cb1cc2658afac0ad584e9bfdbd4145dd *R/PcaProj.R +84afdc34954efcd87bd04c10d1dac2a4 *R/PcaProj.R 16c1b7d22de82739325c854e1237a0b4 *R/Qda.R 182e11977a3de4ea9a69183eee31a082 *R/QdaClassic.R a1959e4b3c1dfe604f6af39d6aed6da5 *R/QdaCov.R @@ -36,13 +36,13 @@ 25a5fe6f3c0bc42acd775034eb6f006d *R/detmrcd.R 0c36abbd8796244b63400966be36ccd2 *R/dets.R 649f519e49932382f68de71ef9cbe6ba *R/donostah.R -2c32c789484733397237e62ae9bb6760 *R/plot-utils.R +3797adf00cf06a422730c94fbe4f6a23 *R/plot-utils.R 6731799ffde9689f52b53bd45a8273c2 *R/psibwt.R dcebffecd8cbf489cede75c6813eabed *R/psifun.R 3762b8071c38856c5fba22f1f17797f3 *R/transform.R bd6c4b899751d5a2e3c456fec562af91 *R/utils.R 5752f99eceda48e21d5743fe05c7c9b6 *R/zzz.R -cc24b09b10214fb9e6c9a5ebf62ef0f8 *build/vignette.rds +3b75cb342bcfa04bc61a94c202a2f4f9 *build/vignette.rds dc91e66b24be42e13e05e3350738de29 *data/Appalachia.rda 256379df09041b35cf1a53bed3e12508 *data/Cascades.rda eb7908cee2761979204dfe7d874024d6 *data/OsloTransect.rda @@ -62,18 +62,18 @@ 36a95bdc17395bffa23901ddc84f24f0 *data/soil.rda 67b1c79477732c5d666d2d580c7259cc *data/un86.rda e7ad7ea33c9a5bd91d0c46dc35f07324 *data/wages.rda -51596f6a6749b1ee72b6842750f159b8 *inst/CITATION -12a680c422ccf7f8b1d95f68f55791d0 *inst/NEWS.Rd +51596f6a6749b1ee72b6842750f159b8 *inst/Citation +85a35231609652cdde1ad43bd08fb036 *inst/NEWS.Rd 0cd7cf2b0f3e787248341b7eb7415973 *inst/doc/rrcov.R 58ccdfd29ee1d1c42b759226e480a68c *inst/doc/rrcov.Rnw -16f8c7a28ae70565b7f96db9c220f529 *inst/doc/rrcov.pdf +9332f15a7825a738184c743cdfa50770 *inst/doc/rrcov.pdf 0f5844b638361c83e2a90f4605d3c0a9 *inst/examples/bm/bm_lts.m ce8cc65f5ce8e9aedf1ac45c3f408022 *inst/examples/bm/bm_mcd.m 1cb5f88839eb05cd065e67c2c3415252 *inst/examples/bm/bmlts.S 3f9ec6b75cdbdee68324fe6907a0214d *inst/examples/bm/bmmcd.S f955d6936d3cde8a1bd825938601c0ae *inst/examples/test-ellipse.R -f8797fb11a1081c4cab7610a31a36540 *man/Appalachia.Rd -00f1a7e08ed0c0b4d9e033edde7696e9 *man/Cascades.Rd +a0901c5ebf120b3a340374f70481839d *man/Appalachia.Rd +5c54f00c5b70324f7f27d5aee624b7db *man/Cascades.Rd ea3270717d98ab23f80fd65fa5057c93 *man/Cov-class.Rd bc81fb026d0aff35f38e64207dab50a4 *man/CovClassic-class.Rd 64ed005bab64d405da0b528892f2e2f0 *man/CovClassic.Rd @@ -162,8 +162,8 @@ cd32b6c3686ec967354fc017a406626b *man/getLoadings-methods.Rd 19c9220469d7db644eb7f885179cdb41 *man/hemophilia.Rd 37cb7c180bf6563504366391de15c8cc *man/isSingular.Rd -ecb227b0175ac8201e93c194637f425f *man/lmom32.Rd -1ff419d2ca28076ea6461fa07698bf8b *man/lmom33.Rd +db0e5e9ff9798192bf162c122f29ef33 *man/lmom32.Rd +e95c14bf85f44bfb576e46b9f9a27a44 *man/lmom33.Rd deb2edecbfed78502752bbf1dcd6bb5a *man/maryo.Rd 93b3d8c62a7190909c7decb1b1b1aa9c *man/octane.Rd 06670e7a6424ba39012a590e33eb558d *man/olitos.Rd @@ -185,11 +185,11 @@ c1e732bb49768c40a41f3d196ed921d2 *src/fast-mve.c ccf4857d53fdada76dfd725ef84d9683 *src/fsada.f c6d3916e13986bd0e2bc0ea73bf278a3 *src/rrcov_init.c -b4aaedc4fce50b5ec8b420c789ff6c1a *src/sest.c +ff85fbb3251f152021ad1adab2c37007 *src/sest.c ce128c182f1d80545b9d52713dfd288d *tests/thubert.R 1e2270032cf419f3f4791e341d5f4814 *tests/thubert.Rout.save -9cac3a2e6e170e167cbf8de9c7c19edf *tests/tlda.R -f3469fe82bd70b8c6fbaca6f0239d770 *tests/tlda.Rout.save +d15b8520f3b8e1e2d220e1d87815d138 *tests/tlda.R +e5a65a90adad1eeade3f5334eac3082f *tests/tlda.Rout.save b438bcce32bc72667d5f353a77e32655 *tests/tldapp.R 439f62ef842f1025f2b8f1f98bb1be9d *tests/tldapp.Rout.save 81f8599fa2320b93acc1e48740f26f8b *tests/tmcd4.R @@ -198,8 +198,8 @@ d5ff4f4b4772061f3ca09d7b8d38161b *tests/tmest4.Rout.save 543589de1df4a8c5b354ea5d5ee2e24e *tests/tmve4.R dc6c9dd3fd406040a54a837b446079b0 *tests/tmve4.Rout.save -2a1e5911d4a26366e9b85d36921bca12 *tests/togk4.R -ab8ec7cc06f8af195f662a7554de148f *tests/togk4.Rout.save +40ae348baf8b55ebcf802ece9a489b59 *tests/togk4.R +3234b08fe1a41dee866b18f991bef344 *tests/togk4.Rout.save 7ed52ca35c24fabd3aca1bac54afcc21 *tests/tqda.R 2e476434e296c3aeda6be662671aeabb *tests/tqda.Rout.save 0c3037618a637218348efe2ee6c03a3c *tests/tsde.R diff -Nru r-cran-rrcov-1.5-2/R/CovMve.R r-cran-rrcov-1.5-5/R/CovMve.R --- r-cran-rrcov-1.5-2/R/CovMve.R 2016-09-06 10:48:49.000000000 +0000 +++ r-cran-rrcov-1.5-5/R/CovMve.R 2020-07-31 20:46:55.000000000 +0000 @@ -34,6 +34,10 @@ ## Options "best" and "exact" for nsamp ## nsamp will be further analized in the wrapper .fastmcd() + ## VT::31.07.2020 - fix an old bug - MVA cannot handle nsamp="best" or "exact" + + if(!missing(nsamp) && !is.numeric(nsamp)) + stop("Number of trials nsamp must be a positive number!") if(!missing(nsamp) && is.numeric(nsamp) && nsamp <= 0) stop("Invalid number of trials nsamp = ",nsamp, "!") diff -Nru r-cran-rrcov-1.5-2/R/CovSest.R r-cran-rrcov-1.5-5/R/CovSest.R --- r-cran-rrcov-1.5-2/R/CovSest.R 2016-09-06 10:48:49.000000000 +0000 +++ r-cran-rrcov-1.5-5/R/CovSest.R 2020-07-31 20:49:26.000000000 +0000 @@ -50,6 +50,11 @@ assign(".Random.seed", seed, envir=.GlobalEnv) } + if(!missing(nsamp) && !is.numeric(nsamp)) + stop("Number of trials nsamp must be a positive number!") + if(!missing(nsamp) && is.numeric(nsamp) && nsamp <= 0) + stop("Invalid number of trials nsamp = ",nsamp, "!") + if(is.data.frame(x)) x <- data.matrix(x) else if (!is.matrix(x)) @@ -1115,7 +1120,7 @@ sig <- median(dis) a <- sig/100 ff <- fespro(a, p, dis, alpha, delta) - while(ff < 0) + while(ff < 0) { a <- a/10 ff <- fespro(a, p, dis, alpha, delta) @@ -1123,7 +1128,7 @@ b <- sig*10 ff <- fespro(b, p, dis, alpha, delta) - while(ff>0) + while(ff>0) { b <- b*10 ff <- fespro(b, p, dis, alpha, delta) @@ -1270,7 +1275,7 @@ cat("\nit, decre1:",it,decre1, "\n") print(des1) } - if(decre1 <= tol) + if(decre1 <= tol) { grad <- gradien(x, mu1, v1, mumin, vmin, sigmin, dismin, sig1, dis1, alpha) mu2 <- grad$mu @@ -1292,8 +1297,8 @@ sigmin <- sig2 } } - - if(decre1 > tol) + + if(decre1 > tol) { decre <- decre1 mumin <- mu1 diff -Nru r-cran-rrcov-1.5-2/R/PcaHubert.R r-cran-rrcov-1.5-5/R/PcaHubert.R --- r-cran-rrcov-1.5-2/R/PcaHubert.R 2016-09-06 10:48:49.000000000 +0000 +++ r-cran-rrcov-1.5-5/R/PcaHubert.R 2020-04-24 21:58:40.000000000 +0000 @@ -285,7 +285,8 @@ } H0 <- order(apply(Z, 1, max)) # n x 1 - the outlyingnesses of all n points - Xh <- X[H0[1:h], ] # the h data points with smallest outlyingness + Xh <- X[H0[1:h],,drop=FALSE] # the h data points with smallest outlyingness. + # VT::24.04.2020 Keep Xh as a mtrix, otherwise .classPC will not work. Xh.svd <- .classPC(Xh) kmax <- min(Xh.svd$rank, kmax) if(trace) diff -Nru r-cran-rrcov-1.5-2/R/PcaProj.R r-cran-rrcov-1.5-5/R/PcaProj.R --- r-cran-rrcov-1.5-2/R/PcaProj.R 2016-09-06 10:48:49.000000000 +0000 +++ r-cran-rrcov-1.5-5/R/PcaProj.R 2020-07-31 22:15:58.000000000 +0000 @@ -78,12 +78,16 @@ } out <- PCAproj(x, k, scale=scale, ...) - scores <- predict(out) center <- out$center scale <- out$scale sdev <- out$sdev - scores <- as.matrix(scores[, 1:k]) loadings <- as.matrix(out$loadings[, 1:k]) + +## VT::31.07.2020 +## scores <- predict(out) +## scores <- as.matrix(scores[, 1:k]) + scores <- (x- matrix(rep(center, nrow(x)), nrow = nrow(x), byrow = TRUE)) %*% loadings + eigenvalues <- (sdev^2)[1:k] ###################################################################### diff -Nru r-cran-rrcov-1.5-2/R/plot-utils.R r-cran-rrcov-1.5-5/R/plot-utils.R --- r-cran-rrcov-1.5-2/R/plot-utils.R 2020-01-14 15:17:30.000000000 +0000 +++ r-cran-rrcov-1.5-5/R/plot-utils.R 2020-06-23 11:44:56.000000000 +0000 @@ -69,7 +69,7 @@ pos = "topright", txt = c("robust", "classical"), col = c("red", "blue"), - lty = c("solid", "dotted"), + lty = c("solid", "solid"), pch = c(1,24))) @@ -169,7 +169,7 @@ .qqplot <- function(x, p, cutoff, classic=FALSE, id.n, main=eval(substitute(expression(paste(chi^2, " QQ-Plot")))), - xlab=eval(substitute(expression(paste("Sqrt of the quantiles of the ", chi^2, " distribution")))), + xlab=eval(substitute(expression(paste("Sqrt of the quantiles of the ", chi[p]^2, " distribution")), list(p=p))), ylab=paste(if(classic) "Mahalanobis" else "Robust", "distance"), labs=1:length(x), ...) @@ -227,7 +227,7 @@ main = "Tolerance ellipse (97.5%)", xlab = "", ylab = "", - labs, + labs, legend.position="bottomright", ...) { @@ -303,7 +303,7 @@ if(classic){ points(z2, type = "l", lty=leg@lty[2], col=leg@col[2]) if(leg@leg) - legend("bottomright", leg@txt, pch=leg@pch, lty=leg@lty, col=leg@col) + legend(legend.position, leg@txt, pch=leg@pch, lty=leg@lty, col=leg@col) } invisible() @@ -612,7 +612,7 @@ ## .xyqqchi2 <- function(obj, cutoff, main=eval(substitute(expression(paste(chi^2, " QQ-Plot")))), - xlab=eval(substitute(expression(paste("Sqrt of the quantiles of the ", chi^2, " distribution")))), + xlab=eval(substitute(expression(paste("Sqrt of the quantiles of the ", chi[p]^2, " distribution")), list(p=p))), ylab="Mahalanobis distance", col="darkred", labs, diff -Nru r-cran-rrcov-1.5-2/src/sest.c r-cran-rrcov-1.5-5/src/sest.c --- r-cran-rrcov-1.5-2/src/sest.c 2018-11-14 17:25:36.000000000 +0000 +++ r-cran-rrcov-1.5-5/src/sest.c 2020-07-31 22:31:15.000000000 +0000 @@ -521,15 +521,17 @@ double *work = (double *) R_alloc(2*pp, sizeof(double)); int *pivot = (int *) R_alloc(pp, sizeof(int)); - // compute the mean, put submatrix into xw, center its columns - for(j=0; j > proc.time() user system elapsed - 4.39 0.78 5.38 + 2.31 0.31 2.60 diff -Nru r-cran-rrcov-1.5-2/tests/togk4.R r-cran-rrcov-1.5-5/tests/togk4.R --- r-cran-rrcov-1.5-2/tests/togk4.R 2020-01-14 16:07:52.000000000 +0000 +++ r-cran-rrcov-1.5-5/tests/togk4.R 2020-07-28 14:07:37.000000000 +0000 @@ -61,15 +61,17 @@ cat("Data Set n p Half LOG(obj) Time\n") cat("========================================================\n") domcd(heart[, 1:2], data(heart), nrep) +## This will not work within the function, of course +## - comment it out ## IGNORE_RDIFF_BEGIN - domcd(starsCYG,data(starsCYG), nrep) +## domcd(starsCYG,data(starsCYG), nrep) ## IGNORE_RDIFF_END domcd(data.matrix(subset(phosphor, select = -plant)), data(phosphor), nrep) domcd(stack.x,data(stackloss), nrep) domcd(data.matrix(subset(coleman, select = -Y)), data(coleman), nrep) domcd(data.matrix(subset(salinity, select = -Y)), data(salinity), nrep) ## IGNORE_RDIFF_BEGIN - domcd(data.matrix(subset(wood, select = -y)), data(wood), nrep) +## domcd(data.matrix(subset(wood, select = -y)), data(wood), nrep) ## IGNORE_RDIFF_END domcd(data.matrix(subset(hbk, select = -Y)), data(hbk), nrep) diff -Nru r-cran-rrcov-1.5-2/tests/togk4.Rout.save r-cran-rrcov-1.5-5/tests/togk4.Rout.save --- r-cran-rrcov-1.5-2/tests/togk4.Rout.save 2020-01-14 16:11:17.000000000 +0000 +++ r-cran-rrcov-1.5-5/tests/togk4.Rout.save 2020-07-28 14:21:36.000000000 +0000 @@ -1,5 +1,5 @@ -R Under development (unstable) (2020-01-08 r77640) -- "Unsuffered Consequences" +R version 4.0.2 (2020-06-22) -- "Taking Off Again" Copyright (C) 2020 The R Foundation for Statistical Computing Platform: x86_64-w64-mingw32/x64 (64-bit) @@ -78,15 +78,17 @@ + cat("Data Set n p Half LOG(obj) Time\n") + cat("========================================================\n") + domcd(heart[, 1:2], data(heart), nrep) ++ ## This will not work within the function, of course ++ ## - comment it out + ## IGNORE_RDIFF_BEGIN -+ domcd(starsCYG,data(starsCYG), nrep) ++ ## domcd(starsCYG,data(starsCYG), nrep) + ## IGNORE_RDIFF_END + domcd(data.matrix(subset(phosphor, select = -plant)), data(phosphor), nrep) + domcd(stack.x,data(stackloss), nrep) + domcd(data.matrix(subset(coleman, select = -Y)), data(coleman), nrep) + domcd(data.matrix(subset(salinity, select = -Y)), data(salinity), nrep) + ## IGNORE_RDIFF_BEGIN -+ domcd(data.matrix(subset(wood, select = -y)), data(wood), nrep) ++ ## domcd(data.matrix(subset(wood, select = -y)), data(wood), nrep) + ## IGNORE_RDIFF_END + domcd(data.matrix(subset(hbk, select = -Y)), data(hbk), nrep) + @@ -126,24 +128,6 @@ height 15.88 32.07 weight 32.07 78.28 -------------------------------------------------------- -starsCYG 47 2 -Outliers: 7 -[1] 7 9 11 14 20 30 34 -------------- - -Call: -CovOgk(x = x) --> Method: Orthogonalized Gnanadesikan-Kettenring Estimator - -Robust Estimate of Location: - log.Te log.light - 4.413 4.934 - -Robust Estimate of Covariance: - log.Te log.light -log.Te 0.01122 0.03755 -log.light 0.03755 0.23499 --------------------------------------------------------- phosphor 18 2 Outliers: 2 [1] 1 6 @@ -221,26 +205,6 @@ X2 -0.6365 3.0976 -1.3520 X3 -0.4720 -1.3520 2.3648 -------------------------------------------------------- -wood 20 5 -Outliers: 0 -------------- - -Call: -CovOgk(x = x) --> Method: Orthogonalized Gnanadesikan-Kettenring Estimator - -Robust Estimate of Location: - x1 x2 x3 x4 x5 -0.5508 0.1330 0.5087 0.5112 0.9069 - -Robust Estimate of Covariance: - x1 x2 x3 x4 x5 -x1 0.0078774 -0.0002767 0.0034220 0.0025563 -0.0027250 -x2 -0.0002767 0.0004644 -0.0003344 -0.0007968 0.0005818 -x3 0.0034220 -0.0003344 0.0039759 0.0014998 -0.0016071 -x4 0.0025563 -0.0007968 0.0014998 0.0037489 -0.0007524 -x5 -0.0027250 0.0005818 -0.0016071 -0.0007524 0.0026191 --------------------------------------------------------- hbk 75 3 Outliers: 14 [1] 1 2 3 4 5 6 7 8 9 10 11 12 13 14 @@ -336,4 +300,4 @@ > > proc.time() user system elapsed - 0.82 0.24 1.06 + 0.40 0.20 0.59