Skip to content

Commit

Permalink
version 7.3-55
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian Ripley authored and cran-robot committed Jan 13, 2022
1 parent d1ac55a commit bf02c44
Show file tree
Hide file tree
Showing 8 changed files with 37 additions and 36 deletions.
10 changes: 5 additions & 5 deletions DESCRIPTION
@@ -1,8 +1,8 @@
Package: MASS
Priority: recommended
Version: 7.3-54
Date: 2021-04-17
Revision: $Rev: 3542 $
Version: 7.3-55
Date: 2022-01-12
Revision: $Rev: 3559 $
Depends: R (>= 3.3.0), grDevices, graphics, stats, utils
Imports: methods
Suggests: lattice, nlme, nnet, survival
Expand All @@ -24,7 +24,7 @@ License: GPL-2 | GPL-3
URL: http://www.stats.ox.ac.uk/pub/MASS4/
Contact: <MASS@stats.ox.ac.uk>
NeedsCompilation: yes
Packaged: 2021-05-03 08:31:21 UTC; ripley
Packaged: 2022-01-13 05:06:37 UTC; ripley
Author: Brian Ripley [aut, cre, cph],
Bill Venables [ctb],
Douglas M. Bates [ctb],
Expand All @@ -33,4 +33,4 @@ Author: Brian Ripley [aut, cre, cph],
David Firth [ctb]
Maintainer: Brian Ripley <ripley@stats.ox.ac.uk>
Repository: CRAN
Date/Publication: 2021-05-03 09:03:50 UTC
Date/Publication: 2022-01-13 08:05:04 UTC
14 changes: 7 additions & 7 deletions MD5
@@ -1,9 +1,9 @@
ecf84f78aac3c625898be45513307d79 *DESCRIPTION
41ba107aaf542c752fd11420209c7355 *DESCRIPTION
35aff05a505ecf7e81e0473767794ca9 *INDEX
c7acdc0fa828f781a0a5586ab9d4fa1b *LICENCE.note
0ac7b30ad35a4c19ea69d76a6a366b02 *NAMESPACE
aed71ed40bb9bfdd7d19edfdbd163087 *R/add.R
f24c684489a4b4096f422e348efc9bae *R/area.R
667178114b2cc60142fed7fc16c00f90 *R/area.R
2b449dd3fde83489799ef5f72bc8ead0 *R/boxcox.R
a22a1823498627d344110a4deb10c0ac *R/confint.R
c03532b46687315c1b68e6cf06b459ed *R/contr.sdif.R
Expand Down Expand Up @@ -46,7 +46,7 @@ f1db7f02de9bae7087fc01a7ffe4748e *R/truehist.R
bbde4307b98d968e9b85d55f46a0cbe6 *R/ucv.R
29fdbf836b6ebffc562ce7d2b54ab5eb *R/write.matrix.R
4f74ab00a8fd8a8eaf56957b1e13aa52 *R/zzz.R
765729459d9b72708f84809bf6fb9df0 *build/partial.rdb
bc7a3f8ea65d80af472bd952a186398d *build/partial.rdb
e4aa969dc4062a5dfa605a141bf32f29 *data/Aids2.rda
3c5a57a9f86ee32ac10f6114826a762b *data/Animals.rda
689cd33a62093be4f53a38cc8405e083 *data/Boston.rda
Expand Down Expand Up @@ -136,7 +136,7 @@ b5b8b289d333f482e24ad32e67f73b39 *data/whiteside.rda
7bc59b5368bad84fac2fad52f03298de *data/wtloss.rda
b712abcbf880df8140a6ba49b039db53 *inst/CITATION
cfe49768ecb548ac7f483e75ce75d0e0 *inst/NEWS
6fc7e36f199b0142ce0c1baacee3ac35 *inst/po/de/LC_MESSAGES/R-MASS.mo
4691e3b8e5718e48ae6ea1d48ce191ab *inst/po/de/LC_MESSAGES/R-MASS.mo
a98aab8a3454f64d861a73a43ab27fc2 *inst/po/en@quot/LC_MESSAGES/R-MASS.mo
6c6d2fb1a34df17dc93c94d47e3c10f4 *inst/po/fr/LC_MESSAGES/R-MASS.mo
9d0982c152c2e43be1362503d0ea1e74 *inst/po/it/LC_MESSAGES/R-MASS.mo
Expand Down Expand Up @@ -315,13 +315,13 @@ ceefe8e558dfa70a28f54fcae1ca3df0 *man/whiteside.Rd
9676e9290685ce7d0527aad90135c048 *man/write.matrix.Rd
62acbc2ad1ace8bca9cfc5f4db22b799 *man/wtloss.Rd
1bc09aa90a7ba7ff4fecb9386997a708 *po/R-MASS.pot
cdd63d060589bdf01860d6ec2536dcf9 *po/R-de.po
6e01eb7d14f84704fb80479c365163ff *po/R-de.po
715ad24e69fca850b0ede2d688c84a22 *po/R-fr.po
2f300df61a52b6d876d9ebadcc447cd2 *po/R-it.po
1191b3abb0caad62ecd5e4ad544361c4 *po/R-ko.po
b6e225a125d6368318896f92ffd91e0f *po/R-pl.po
a79fc62d284fd106014fc6176155245a *src/MASS.c
6e5f48c7ce8b734c48cf01616813acb0 *src/lqs.c
020be0ec5305b41949da681312f305cb *src/MASS.c
1d9128cf14bc66205891d2dbeed67ff4 *src/lqs.c
7b1360150b8598b576e82534b12345a2 *tests/BankWages.rda
fd0fa10e74ef7c32ec1af084d6c0b266 *tests/Examples/MASS-Ex.Rout.save
d87553db40364fdc9c337fa31c009b17 *tests/confint.R
Expand Down
2 changes: 1 addition & 1 deletion R/area.R
Expand Up @@ -27,7 +27,7 @@ function(f, a, b, ..., fa = f(a, ...), fb = f(b, ...), limit
return(a2)
if(limit == 0) {
warning(gettextf("iteration limit reached near 'x = %f'", d),
doman = NA)
domain = NA)
return(a2)
}
Recall(f, a, d, ..., fa = fa, fb = fd, limit = limit - 1,
Expand Down
Binary file modified build/partial.rdb
Binary file not shown.
Binary file modified inst/po/de/LC_MESSAGES/R-MASS.mo
Binary file not shown.
8 changes: 4 additions & 4 deletions po/R-de.po
Expand Up @@ -5,10 +5,10 @@
# Detlef Steuer <steuer@hsu-hh.de>, 2012-2014
msgid ""
msgstr ""
"Project-Id-Version: R 3.1.0 / MASS 7.3-30\n"
"Project-Id-Version: R-4.1.0 / MASS 7.3-53.1\n"
"Report-Msgid-Bugs-To: bugs@r-project.org\n"
"POT-Creation-Date: 2021-02-12 09:53\n"
"PO-Revision-Date: 2014-03-16 16:32+0100\n"
"PO-Revision-Date: 2021-05-04 15:23+0200\n"
"Last-Translator: Detlef Steuer <steuer@hsu-hh.de>\n"
"Language-Team: German <debian-l10n-german@lists.debian.org>\n"
"Language: de\n"
Expand Down Expand Up @@ -302,10 +302,10 @@ msgid "at least one column has IQR 0"
msgstr "mindestens eine Spalte hat IQR 0"

msgid "Too many samples (%.3g)"
msgstr ""
msgstr "Zu viele Stichproben (%.3g)"

msgid "Too many combinations (%.3g) for nsamp = \"exact\""
msgstr ""
msgstr "Zu viele Kombinationen (%.3g) für nsamp = \"exact\""

msgid "'x' is probably collinear"
msgstr "'x' ist wahrscheinlich kollinear"
Expand Down
36 changes: 18 additions & 18 deletions src/MASS.c
@@ -1,5 +1,5 @@
/*
* MASS/src/MASS.c by W. N. Venables and B. D. Ripley Copyright (C) 1994-2016
* MASS/src/MASS.c by W. N. Venables and B. D. Ripley Copyright (C) 1994-2022
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -43,10 +43,10 @@ VR_sammon(double *dd, Sint *nn, Sint *kd, double *Y, Sint *niter,
double xd, xx;
double e, epast, eprev, tot, d, d1, ee, magic = *aa;

xu = Calloc(nd * n, double);
xv = Calloc(nd, double);
e1 = Calloc(nd, double);
e2 = Calloc(nd, double);
xu = R_Calloc(nd * n, double);
xv = R_Calloc(nd, double);
e1 = R_Calloc(nd, double);
e2 = R_Calloc(nd, double);

epast = eprev = 1.0;

Expand Down Expand Up @@ -150,10 +150,10 @@ VR_sammon(double *dd, Sint *nn, Sint *kd, double *Y, Sint *niter,
}
}
*stress = e;
Free(xu);
Free(xv);
Free(e1);
Free(e2);
R_Free(xu);
R_Free(xv);
R_Free(e1);
R_Free(e2);
}

/*
Expand Down Expand Up @@ -194,12 +194,12 @@ VR_mds_init_data(Sint *pn, Sint *pc, Sint *pr, Sint *orde,
nr = *pr;
nc = *pc;
dimx = nr * nc;
ord = Calloc(n, Sint);
ord2 = Calloc(n, Sint);
x = Calloc(dimx, double);
d = Calloc(n, double);
y = Calloc(n, double);
yf = Calloc(n, double);
ord = R_Calloc(n, Sint);
ord2 = R_Calloc(n, Sint);
x = R_Calloc(dimx, double);
d = R_Calloc(n, double);
y = R_Calloc(n, double);
yf = R_Calloc(n, double);
for (i = 0; i < n; i++) ord[i] = orde[i];
for (i = 0; i < n; i++) ord2[i] = ordee[i];
for (i = 0; i < dimx; i++) x[i] = xx[i];
Expand All @@ -209,7 +209,7 @@ VR_mds_init_data(Sint *pn, Sint *pc, Sint *pr, Sint *orde,
void
VR_mds_unload(void)
{
Free(ord); Free(ord2); Free(x); Free(d); Free(y); Free(yf);
R_Free(ord); R_Free(ord2); R_Free(x); R_Free(d); R_Free(y); R_Free(yf);
}


Expand Down Expand Up @@ -285,7 +285,7 @@ VR_mds_fn(double *y, double *yf, Sint *pn, double *pssq, Sint *pd,
double tmp, tmp1, sgn, ssq, *yc, slope, tstar, sstar, mink = *p;
int euclid = (mink == 2.);

yc = Calloc((n + 1), double);
yc = R_Calloc((n + 1), double);
yc[0] = 0.0;
tmp = 0.0;
for (i = 0; i < n; i++) {
Expand Down Expand Up @@ -315,7 +315,7 @@ VR_mds_fn(double *y, double *yf, Sint *pn, double *pssq, Sint *pd,
}
ssq = 100 * sqrt(sstar / tstar);
*pssq = ssq;
Free(yc);
R_Free(yc);
if (!(*do_derivatives)) return;
/* get derivatives */
for (u = 0; u < r; u++) {
Expand Down
3 changes: 2 additions & 1 deletion src/lqs.c
@@ -1,6 +1,6 @@
/*
* R : A Computer Language for Statistical Data Analysis
* Copyright (C) 1998-2016 B. D. Ripley
* Copyright (C) 1998-2022 B. D. Ripley
* Copyright (C) 1999 R Development Core Team
*
* This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -31,6 +31,7 @@
#include <R_ext/Linpack.h>
#include <R_ext/Applic.h> /* for the QR routines */
#include <R_ext/Utils.h> /* for the *sort() routines */
#include <float.h>
#define BIG DBL_MAX

/* GLOBAL Variables, explicitly allocated and freed: */
Expand Down

0 comments on commit bf02c44

Please sign in to comment.