diff -Nru r-cran-class-7.3-19/debian/changelog r-cran-class-7.3-20/debian/changelog --- r-cran-class-7.3-19/debian/changelog 2021-05-06 15:48:45.000000000 +0000 +++ r-cran-class-7.3-20/debian/changelog 2022-01-17 03:21:18.000000000 +0000 @@ -1,11 +1,28 @@ -r-cran-class (7.3-19-1.1804.0) bionic; urgency=medium +r-cran-class (7.3-20-1.1804.0) bionic; urgency=medium - * Compilation for Ubuntu 18.04.5 LTS + * Compilation for Ubuntu 18.04.6 LTS * Remove dependency for R 4.0.0 for backports in Ubuntu * debian/control, debian/rules, debian/compat: revert to a version of debheler <= 10 - -- Michael Rutter Thu, 06 May 2021 15:48:45 +0000 + -- Michael Rutter Mon, 17 Jan 2022 03:21:18 +0000 + +r-cran-class (7.3-20-1) unstable; urgency=medium + + * New upstream release + + * debian/control: Set Build-Depends: to current R version + * debian/control: Set Standards-Version: to current version + + -- Dirk Eddelbuettel Thu, 13 Jan 2022 08:32:14 -0600 + +r-cran-class (7.3-19-2) unstable; urgency=medium + + * Simple rebuild for unstable following Debian 11 release + + * debian/control: Set Build-Depends: to current R version + + -- Dirk Eddelbuettel Mon, 16 Aug 2021 08:07:14 -0500 r-cran-class (7.3-19-1) experimental; urgency=medium diff -Nru r-cran-class-7.3-19/debian/control r-cran-class-7.3-20/debian/control --- r-cran-class-7.3-19/debian/control 2021-05-06 15:48:45.000000000 +0000 +++ r-cran-class-7.3-20/debian/control 2022-01-17 03:21:18.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Dirk Eddelbuettel Build-Depends: , r-base-dev, dh-r, r-cran-mass, dh-r -Standards-Version: 4.5.1 +Standards-Version: 4.6.0 Vcs-Browser: https://salsa.debian.org/edd/r-cran-class Vcs-Git: https://salsa.debian.org/edd/r-cran-class.git Homepage: https://cran.r-project.org/package=class diff -Nru r-cran-class-7.3-19/DESCRIPTION r-cran-class-7.3-20/DESCRIPTION --- r-cran-class-7.3-19/DESCRIPTION 2021-05-03 09:03:56.000000000 +0000 +++ r-cran-class-7.3-20/DESCRIPTION 2022-01-13 08:05:10.000000000 +0000 @@ -1,7 +1,7 @@ Package: class Priority: recommended -Version: 7.3-19 -Date: 2021-04-17 +Version: 7.3-20 +Date: 2022-01-12 Depends: R (>= 3.0.0), stats, utils Imports: MASS Authors@R: c(person("Brian", "Ripley", role = c("aut", "cre", "cph"), @@ -14,9 +14,9 @@ License: GPL-2 | GPL-3 URL: http://www.stats.ox.ac.uk/pub/MASS4/ NeedsCompilation: yes -Packaged: 2021-05-03 08:31:22 UTC; ripley +Packaged: 2022-01-13 05:06:38 UTC; ripley Author: Brian Ripley [aut, cre, cph], William Venables [cph] Maintainer: Brian Ripley Repository: CRAN -Date/Publication: 2021-05-03 09:03:56 UTC +Date/Publication: 2022-01-13 08:05:10 UTC diff -Nru r-cran-class-7.3-19/MD5 r-cran-class-7.3-20/MD5 --- r-cran-class-7.3-19/MD5 2021-05-03 09:03:56.000000000 +0000 +++ r-cran-class-7.3-20/MD5 2022-01-13 08:05:10.000000000 +0000 @@ -1,4 +1,4 @@ -cb6f28fb535436ad0ac1ffb8d28c0c8e *DESCRIPTION +c85caea72c963aee6dfa23c3c0309fc0 *DESCRIPTION a0e96c11b4d12e246a178ca1e77f7f7e *LICENCE.note a92febb02a17971969afc1e4e4067279 *NAMESPACE 44e5755ae2d5d1f1b8509879577c17a5 *R/SOM.R @@ -35,4 +35,4 @@ 492fd736f45313a71f7ab3b491fda0a0 *po/R-it.po 161dc97e9c24260b24b9304c3f69d642 *po/R-ko.po 4fcc24f341019a4f3101815fd34f960c *po/R-pl.po -e74edc8ed027013f6d6b838eab7d0bc3 *src/class.c +afdbd484afd8f6d78a9ac578c465ed5a *src/class.c diff -Nru r-cran-class-7.3-19/src/class.c r-cran-class-7.3-20/src/class.c --- r-cran-class-7.3-19/src/class.c 2020-03-25 07:34:28.000000000 +0000 +++ r-cran-class-7.3-20/src/class.c 2022-01-12 19:07:53.000000000 +0000 @@ -1,5 +1,5 @@ /* - * class/src/class.c by W. N. Venables and B. D. Ripley Copyright (C) 1994-2018 + * class/src/class.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 @@ -35,9 +35,9 @@ double dm, dist, tmp; RANDIN; - ind = Calloc(ntr, int); + ind = R_Calloc(ntr, int); for (npat = 0; npat < nte; npat++) { - dm = DOUBLE_XMAX; + dm = DBL_MAX; // was DOUBLE_XMAX; for (j = 0; j < ntr; j++) { dist = 0.0; for (k = 0; k < *p; k++) { @@ -83,7 +83,7 @@ dists[npat] = dm; } RANDOUT; - Free(ind); + R_Free(ind); } @@ -111,7 +111,7 @@ for (npat = 0; npat < nte; npat++) { kn = kinit; for (k = 0; k < kn; k++) - nndist[k] = 0.99 * DOUBLE_XMAX; + nndist[k] = 0.99 * DBL_MAX; for (j = 0; j < ntr; j++) { if ((*cv > 0) && (j == npat)) continue; @@ -136,7 +136,7 @@ error("too many ties in knn"); break; } - nndist[kn] = 0.99 * DOUBLE_XMAX; + nndist[kn] = 0.99 * DBL_MAX; } for (j = 0; j <= *nc; j++) @@ -215,12 +215,12 @@ double *al; double dist, dm, tmp; - al = Calloc(ncodes, double); + al = R_Calloc(ncodes, double); for (j = 0; j < ncodes; j++) al[j] = *alpha; for (iter = 0; iter < *niter; iter++) { npat = iters[iter]; - dm = DOUBLE_XMAX; + dm = DBL_MAX; for (j = 0; j < ncodes; j++) { dist = 0.0; for (k = 0; k < *p; k++) { @@ -238,7 +238,7 @@ (x[npat + k * n] - xc[index + k * ncodes]); al[index] = min9(*alpha, al[index] / (1 + s * al[index])); } - Free(al); + R_Free(al); } void @@ -253,7 +253,7 @@ for (iter = 0; iter < *niter; iter++) { npat = iters[iter]; alpha_t = *alpha * (*niter - iter) / (double) *niter; - dm = DOUBLE_XMAX; + dm = DBL_MAX; for (j = 0; j < ncodes; j++) { dist = 0.0; for (k = 0; k < *p; k++) { @@ -285,7 +285,7 @@ for (iter = 0; iter < *niter; iter++) { npat = iters[iter]; alpha_t = *alpha * (*niter - iter) / (double) *niter; - ndm = dm = DOUBLE_XMAX; + ndm = dm = DBL_MAX; /* Find two nearest codebook vectors */ for (j = 0; j < ncodes; j++) { @@ -336,7 +336,7 @@ for (iter = 0; iter < *niter; iter++) { npat = iters[iter]; alpha_t = *alpha * (*niter - iter) / (double) *niter; - ndm = dm = DOUBLE_XMAX; + ndm = dm = DBL_MAX; /* Find two nearest codebook vectors */ for (j = 0; j < ncodes; j++) { dist = 0.0; @@ -397,7 +397,7 @@ /* find the nearest code 'near' */ /* nind is the number of tied minima, unlike VR_knn1 */ nind = 1; // for compilers: set to 1 when first min found. - dm = DOUBLE_XMAX; + dm = DBL_MAX; for (cd = 0; cd < ncodes; cd++) { dist = 0.0; for (j = 0; j < p; j++) {