[Distr-commits] r1132 - branches/distr-2.7/pkg/SweaveListingUtils/vignettes branches/distr-2.7/pkg/distr branches/distr-2.7/pkg/distr/vignettes branches/distr-2.7/pkg/distrDoc/vignettes pkg/SweaveListingUtils pkg/SweaveListingUtils/vignettes pkg/distr pkg/distr/inst pkg/distr/man pkg/distr/vignettes pkg/distrDoc pkg/distrDoc/vignettes pkg/distrEx pkg/distrEx/R pkg/distrEx/inst pkg/distrEx/man pkg/distrEx/src
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Fri Apr 21 17:56:02 CEST 2017
Author: ruckdeschel
Date: 2017-04-21 17:56:01 +0200 (Fri, 21 Apr 2017)
New Revision: 1132
Modified:
branches/distr-2.7/pkg/SweaveListingUtils/vignettes/ExampleSweaveListingUtils.Rnw
branches/distr-2.7/pkg/distr/NAMESPACE
branches/distr-2.7/pkg/distr/vignettes/newDistributions.Rnw
branches/distr-2.7/pkg/distrDoc/vignettes/distr.Rnw
pkg/SweaveListingUtils/DESCRIPTION
pkg/SweaveListingUtils/vignettes/ExampleSweaveListingUtils.Rnw
pkg/distr/DESCRIPTION
pkg/distr/NAMESPACE
pkg/distr/inst/NEWS
pkg/distr/man/0distr-package.Rd
pkg/distr/vignettes/newDistributions.Rnw
pkg/distrDoc/DESCRIPTION
pkg/distrDoc/vignettes/distr.Rnw
pkg/distrEx/DESCRIPTION
pkg/distrEx/NAMESPACE
pkg/distrEx/R/distrExIntegrate.R
pkg/distrEx/inst/NEWS
pkg/distrEx/man/0distrEx-package.Rd
pkg/distrEx/src/GLaw.c
Log:
+ [distr/Trunk] included new useDynLib directive in DESCRIPTION
+ updated NEWS files
+ registration of native routines in distrEx
+ updated address (Oldenburg) in several vignettes
Modified: branches/distr-2.7/pkg/SweaveListingUtils/vignettes/ExampleSweaveListingUtils.Rnw
===================================================================
--- branches/distr-2.7/pkg/SweaveListingUtils/vignettes/ExampleSweaveListingUtils.Rnw 2017-04-20 20:45:25 UTC (rev 1131)
+++ branches/distr-2.7/pkg/SweaveListingUtils/vignettes/ExampleSweaveListingUtils.Rnw 2017-04-21 15:56:01 UTC (rev 1132)
@@ -96,9 +96,11 @@
%,version \pkgExversion}
\author{\small Peter Ruckdeschel\thanks{Fraunhofer ITWM, Kaiserslautern}
\smallskip\\
-\small Fraunhofer ITWM\\[-.5ex]
-\small Fraunhofer Platz 1\\[-.5ex]
-\small 67663 Kaiserslautern\\[-.5ex]
+\small Institute for Mathematics\\[-.5ex]
+\small School of Mathematics and Science\\[-.5ex]
+\small Oldenburg University\\[-.5ex]
+\small PO box 25 03\\[-.5ex]
+\small 26111 Oldenburg (Oldb.)\\[-.5ex]
\small Germany\\
\small e-Mail: \href{mailto:peter.ruckdeschel at uni-oldenburg.de}%
{\small \tt {peter.ruckdeschel at uni-oldenburg.de}}\medskip\\
Modified: branches/distr-2.7/pkg/distr/NAMESPACE
===================================================================
--- branches/distr-2.7/pkg/distr/NAMESPACE 2017-04-20 20:45:25 UTC (rev 1131)
+++ branches/distr-2.7/pkg/distr/NAMESPACE 2017-04-21 15:56:01 UTC (rev 1132)
@@ -1,4 +1,4 @@
-useDynLib("distr", .registration = TRUE, .fixes = "C_")
+useDynLib(distr, .registration = TRUE, .fixes = "C_")
import("methods")
import("stats")
importFrom("grDevices", "dev.list", "dev.new", "xy.coords")
Modified: branches/distr-2.7/pkg/distr/vignettes/newDistributions.Rnw
===================================================================
--- branches/distr-2.7/pkg/distr/vignettes/newDistributions.Rnw 2017-04-20 20:45:25 UTC (rev 1131)
+++ branches/distr-2.7/pkg/distr/vignettes/newDistributions.Rnw 2017-04-21 15:56:01 UTC (rev 1132)
@@ -85,13 +85,15 @@
% -------------------------------------------------------------------------------
\title{How to generate new distributions in packages \pkg{distr}, \pkg{distrEx}}
%,version \pkgExversion}
-\author{\small Peter Ruckdeschel\thanks{Fraunhofer ITWM, Kaiserslautern}
+\author{\small Peter Ruckdeschel\thanks{Universit\"at Oldenburg, Oldenburg}
\\[-.5ex]
\small Matthias Kohl\thanks{FH Furtwangen}
\smallskip\\
-\small Fraunhofer ITWM\\[-.5ex]
-\small Fraunhofer Platz 1\\[-.5ex]
-\small 67663 Kaiserslautern\\[-.5ex]
+\small Institut f\"ur Mathematik\\[-0.5ex]
+\small Fakult\"at V - Mathematik und Naturwissenschaften\\[-.5ex]
+\small Carl von Ossietzky Universit\"at Oldenburg\\[-0.5ex]
+\small PObox 2503\\[-.5ex]
+\small 26111 Oldenburg (Oldb)\\[-.5ex]
\small Germany\\
\small e-Mail: {\small \tt peter.ruckdeschel at uni-oldenburg.de}\medskip\\
\parbox[t]{5cm}{
Modified: branches/distr-2.7/pkg/distrDoc/vignettes/distr.Rnw
===================================================================
--- branches/distr-2.7/pkg/distrDoc/vignettes/distr.Rnw 2017-04-20 20:45:25 UTC (rev 1131)
+++ branches/distr-2.7/pkg/distrDoc/vignettes/distr.Rnw 2017-04-21 15:56:01 UTC (rev 1132)
@@ -115,6 +115,7 @@
\smallskip\\
\small Institute for Mathematics\\[-.5ex]
\small School of Mathematics and Science\\[-.5ex]
+\small Oldenburg University\\[-.5ex]
\small PO box 25 03\\[-.5ex]
\small 26111 Oldenburg (Oldb.)\\[-.5ex]
\small Germany\\
Modified: pkg/SweaveListingUtils/DESCRIPTION
===================================================================
--- pkg/SweaveListingUtils/DESCRIPTION 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/SweaveListingUtils/DESCRIPTION 2017-04-21 15:56:01 UTC (rev 1132)
@@ -4,9 +4,9 @@
and for including R / Rd source file (snippets) copied from R-forge in its most
recent version (or another URL) thereby avoiding inconsistencies between vignette
and documented source code.
-Version: 0.7.5
+Version: 0.7.6
Encoding: latin1
-Date: 2016-04-25
+Date: 2017-04-21
Depends: R(>= 2.14.0), startupmsg
Suggests: distr, MASS, survival, distrEx, Matrix, splines
Imports: methods
@@ -16,4 +16,4 @@
License: LGPL-3
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 1108
\ No newline at end of file
+SVNRevision: 1133
\ No newline at end of file
Modified: pkg/SweaveListingUtils/vignettes/ExampleSweaveListingUtils.Rnw
===================================================================
--- pkg/SweaveListingUtils/vignettes/ExampleSweaveListingUtils.Rnw 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/SweaveListingUtils/vignettes/ExampleSweaveListingUtils.Rnw 2017-04-21 15:56:01 UTC (rev 1132)
@@ -96,9 +96,11 @@
%,version \pkgExversion}
\author{\small Peter Ruckdeschel\thanks{Fraunhofer ITWM, Kaiserslautern}
\smallskip\\
-\small Fraunhofer ITWM\\[-.5ex]
-\small Fraunhofer Platz 1\\[-.5ex]
-\small 67663 Kaiserslautern\\[-.5ex]
+\small Institute for Mathematics\\[-.5ex]
+\small School of Mathematics and Science\\[-.5ex]
+\small Oldenburg University\\[-.5ex]
+\small PO box 25 03\\[-.5ex]
+\small 26111 Oldenburg (Oldb.)\\[-.5ex]
\small Germany\\
\small e-Mail: \href{mailto:peter.ruckdeschel at uni-oldenburg.de}%
{\small \tt {peter.ruckdeschel at uni-oldenburg.de}}\medskip\\
Modified: pkg/distr/DESCRIPTION
===================================================================
--- pkg/distr/DESCRIPTION 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/distr/DESCRIPTION 2017-04-21 15:56:01 UTC (rev 1132)
@@ -1,5 +1,5 @@
Package: distr
-Version: 2.6.1
+Version: 2.6.2
Date: 2017-04-21
Title: Object Oriented Implementation of Distributions
Description: S4-classes and methods for distributions.
@@ -19,4 +19,4 @@
URL: http://distr.r-forge.r-project.org/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 1088
+SVNRevision: 1132
Modified: pkg/distr/NAMESPACE
===================================================================
--- pkg/distr/NAMESPACE 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/distr/NAMESPACE 2017-04-21 15:56:01 UTC (rev 1132)
@@ -1,4 +1,4 @@
-useDynLib("distr")
+useDynLib(distr, .registration = TRUE, .fixes = "C_")
import("methods")
import("stats")
importFrom("grDevices", "dev.list", "dev.new", "xy.coords")
Modified: pkg/distr/inst/NEWS
===================================================================
--- pkg/distr/inst/NEWS 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/distr/inst/NEWS 2017-04-21 15:56:01 UTC (rev 1132)
@@ -8,6 +8,13 @@
information)
##############
+v 2.6.2
+##############
++ fixed internals as triggered by mail "CRAN package distr"
+ by Kurt Hornik from Apr 07 2017; most importantly, we
+ registered native code and took out some usage example of sqrt().
+
+##############
v 2.6
##############
Modified: pkg/distr/man/0distr-package.Rd
===================================================================
--- pkg/distr/man/0distr-package.Rd 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/distr/man/0distr-package.Rd 2017-04-21 15:56:01 UTC (rev 1132)
@@ -43,15 +43,15 @@
\details{
\tabular{ll}{
Package: \tab distr \cr
-Version: \tab 2.7 \cr
-Date: \tab 2015-11-07 \cr
+Version: \tab 2.6.2 \cr
+Date: \tab 2017-04-21 \cr
Depends: \tab R(>= 2.14.0), methods, graphics, startupmsg, sfsmisc, SweaveListingUtils \cr
Suggests: \tab distrEx, svUnit (>= 0.7-11) \cr
Imports: \tab stats, grDevices, utils, MASS \cr
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
URL: \tab http://distr.r-forge.r-project.org/\cr
-SVNRevision: \tab 1080 \cr
+SVNRevision: \tab 1132 \cr
}}
Modified: pkg/distr/vignettes/newDistributions.Rnw
===================================================================
--- pkg/distr/vignettes/newDistributions.Rnw 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/distr/vignettes/newDistributions.Rnw 2017-04-21 15:56:01 UTC (rev 1132)
@@ -85,13 +85,15 @@
% -------------------------------------------------------------------------------
\title{How to generate new distributions in packages \pkg{distr}, \pkg{distrEx}}
%,version \pkgExversion}
-\author{\small Peter Ruckdeschel\thanks{Fraunhofer ITWM, Kaiserslautern}
+\author{\small Peter Ruckdeschel\thanks{Universit\"at Oldenburg, Oldenburg}
\\[-.5ex]
\small Matthias Kohl\thanks{FH Furtwangen}
\smallskip\\
-\small Fraunhofer ITWM\\[-.5ex]
-\small Fraunhofer Platz 1\\[-.5ex]
-\small 67663 Kaiserslautern\\[-.5ex]
+\small Institut f\"ur Mathematik\\[-0.5ex]
+\small Fakult\"at V - Mathematik und Naturwissenschaften\\[-.5ex]
+\small Carl von Ossietzky Universit\"at Oldenburg\\[-0.5ex]
+\small PObox 2503\\[-.5ex]
+\small 26111 Oldenburg (Oldb)\\[-.5ex]
\small Germany\\
\small e-Mail: {\small \tt peter.ruckdeschel at uni-oldenburg.de}\medskip\\
\parbox[t]{5cm}{
Modified: pkg/distrDoc/DESCRIPTION
===================================================================
--- pkg/distrDoc/DESCRIPTION 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/distrDoc/DESCRIPTION 2017-04-21 15:56:01 UTC (rev 1132)
@@ -1,6 +1,6 @@
Package: distrDoc
-Version: 2.6
-Date: 2016-04-23
+Version: 2.6.1
+Date: 2017-04-21
Title: Documentation for 'distr' Family of R Packages
Description: Provides documentation in form of a common vignette to packages 'distr', 'distrEx',
'distrMod', 'distrSim', 'distrTEst', 'distrTeach', and 'distrEllipse'.
@@ -21,4 +21,4 @@
URL: http://distr.r-forge.r-project.org/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 1097
+SVNRevision: 1132
Modified: pkg/distrDoc/vignettes/distr.Rnw
===================================================================
--- pkg/distrDoc/vignettes/distr.Rnw 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/distrDoc/vignettes/distr.Rnw 2017-04-21 15:56:01 UTC (rev 1132)
@@ -115,6 +115,7 @@
\smallskip\\
\small Institute for Mathematics\\[-.5ex]
\small School of Mathematics and Science\\[-.5ex]
+\small Oldenburg University\\[-.5ex]
\small PO box 25 03\\[-.5ex]
\small 26111 Oldenburg (Oldb.)\\[-.5ex]
\small Germany\\
Modified: pkg/distrEx/DESCRIPTION
===================================================================
--- pkg/distrEx/DESCRIPTION 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/distrEx/DESCRIPTION 2017-04-21 15:56:01 UTC (rev 1132)
@@ -1,6 +1,6 @@
Package: distrEx
-Version: 2.6
-Date: 2016-04-23
+Version: 2.6.1
+Date: 2017-04-21
Title: Extensions of Package 'distr'
Description: Extends package 'distr' by functionals, distances, and conditional distributions.
Depends: R(>= 2.10.0), methods, distr(>= 2.2)
@@ -15,4 +15,4 @@
URL: http://distr.r-forge.r-project.org/
LastChangedDate: {$LastChangedDate$}
LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 1089
+SVNRevision: 1133
Modified: pkg/distrEx/NAMESPACE
===================================================================
--- pkg/distrEx/NAMESPACE 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/distrEx/NAMESPACE 2017-04-21 15:56:01 UTC (rev 1132)
@@ -1,4 +1,4 @@
-useDynLib("distrEx")
+useDynLib("distrEx", .registration = TRUE, .fixes = "C_")
importFrom("stats", "dnorm", "integrate", "optimize", "pbinom",
"pchisq", "pexp", "pnorm", "ppois", "qcauchy", "qnorm",
"uniroot")
Modified: pkg/distrEx/R/distrExIntegrate.R
===================================================================
--- pkg/distrEx/R/distrExIntegrate.R 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/distrEx/R/distrExIntegrate.R 2017-04-21 15:56:01 UTC (rev 1132)
@@ -40,9 +40,10 @@
W <- numeric(n)
# mm<-dyn.load("G:/rtest/GLaw.dll")
- erg<-.C("gauleg",n = as.integer(n),eps = as.double(.Machine$double.eps),
- A = as.double(A),W = as.double(W), PACKAGE = "distrEx")
+ erg<-.C(C_gauleg,n = as.integer(n),eps = as.double(.Machine$double.eps),
+ A = as.double(A),W = as.double(W)) #, PACKAGE = "distrEx")
### PACKAGE ARGUMENT added P.R. 270507
+ #### removed again 200417 / used registered symbol instead
# dyn.unload("G:/rtest/GLaw.dll")
#
# P.R. 20140810: .Call interface instead of .C interface
Modified: pkg/distrEx/inst/NEWS
===================================================================
--- pkg/distrEx/inst/NEWS 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/distrEx/inst/NEWS 2017-04-21 15:56:01 UTC (rev 1132)
@@ -8,6 +8,13 @@
information)
##############
+v 2.6.1
+##############
++ fixed internals as triggered by mail "CRAN package distr"
+ by Kurt Hornik from Apr 07 2017; most importantly, we
+ registered native code
+
+##############
v 2.6
##############
Modified: pkg/distrEx/man/0distrEx-package.Rd
===================================================================
--- pkg/distrEx/man/0distrEx-package.Rd 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/distrEx/man/0distrEx-package.Rd 2017-04-21 15:56:01 UTC (rev 1132)
@@ -27,15 +27,15 @@
\details{
\tabular{ll}{
Package: \tab distrEx \cr
-Version: \tab 2.6 \cr
-Date: \tab 2016-04-23 \cr
+Version: \tab 2.6.1 \cr
+Date: \tab 2017-04-21 \cr
Depends: \tab R(>= 2.10.0), methods, distr(>= 2.2) \cr
Imports: \tab startupmsg, utils, stats \cr
Suggests: \tab tcltk \cr
LazyLoad: \tab yes \cr
License: \tab LGPL-3 \cr
URL: \tab http://distr.r-forge.r-project.org/\cr
-SVNRevision: \tab 1089 \cr
+SVNRevision: \tab 1132 \cr
}
}
\section{Classes}{
@@ -222,7 +222,7 @@
\references{
P. Ruckdeschel, M. Kohl, T. Stabla, F. Camphausen (2006):
S4 Classes for Distributions, \emph{R News}, \emph{6}(2), 2-6.
-\url{http://CRAN.R-project.org/doc/Rnews/Rnews_2006-2.pdf}
+\url{https://CRAN.R-project.org/doc/Rnews/Rnews_2006-2.pdf}
%a more detailed manual for \pkg{distr}, \pkg{distrSim}, \pkg{distrTEst}, and \pkg{distrEx} may be downloaded from
%\url{http://www.uni-bayreuth.de/departments/math/org/mathe7/DISTR/distr.pdf}\cr
Modified: pkg/distrEx/src/GLaw.c
===================================================================
--- pkg/distrEx/src/GLaw.c 2017-04-20 20:45:25 UTC (rev 1131)
+++ pkg/distrEx/src/GLaw.c 2017-04-21 15:56:01 UTC (rev 1132)
@@ -3,8 +3,12 @@
#include <R.h>
#include <Rinternals.h>
#include <Rmath.h> /* constants */
+#include <R_ext/Rdynload.h>
+#include <R_ext/Visibility.h>
-void gauleg(int *n, double *eps, double *A, double *W)
+#define C_DEF(name, n) {#name, (DL_FUNC) &name, n}
+
+void attribute_hidden gauleg(int *n, double *eps, double *A, double *W)
{ int i,j, m=((*n)+1)/2; double z1,z,pp,p1,p2,p3;
for(i=1;i<=m;i++){
z=cos(PI*(i-0.25)/((*n)+0.5));
@@ -26,6 +30,21 @@
}
}
+/* P.R. 20170427: register routine */
+
+static const R_CMethodDef R_CDef[] = {
+ C_DEF(gauleg, 4),
+ {NULL, NULL, 0}
+};
+
+void attribute_visible R_init_distrEx(DllInfo *dll)
+{
+ R_registerRoutines(dll, R_CDef, NULL, NULL, NULL);
+ R_useDynamicSymbols(dll, FALSE);
+ R_forceSymbols(dll, TRUE);
+
+}
+
/* P.R. 20140810: Yet to be tested: preparation for .Call - interface
SEXP Gauleg(SEXP nFromR, SEXP epsFromR)
More information about the Distr-commits
mailing list