[r-cran-geepack] 04/17: Imported Upstream version 1.2-0.2
Andreas Tille
tille at debian.org
Fri Dec 16 15:38:40 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository r-cran-geepack.
commit 739efae48b6d1f7411edaf69c47eace328cec740
Author: Andreas Tille <tille at debian.org>
Date: Fri Dec 16 13:35:56 2016 +0100
Imported Upstream version 1.2-0.2
---
DESCRIPTION | 6 +++---
MD5 | 18 +++++++++---------
NAMESPACE | 9 +++++++++
build/vignette.rds | Bin 265 -> 264 bytes
inst/include/gee2.h | 4 ++--
inst/include/inter.h | 4 ++--
inst/include/ordgee.h | 4 ++--
src/famstr.cc | 5 ++---
src/inter.cc | 2 --
src/utils.cc | 5 +----
10 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/DESCRIPTION b/DESCRIPTION
index 89b2148..40aad1d 100755
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,5 +1,5 @@
Package: geepack
-Version: 1.2-0
+Version: 1.2-0.2
Title: Generalized Estimating Equation Package
Author: S�ren H�jsgaard, <sorenh at math.aau.dk>, Ulrich Halekoh <Ulrich.Halekoh at agrsci.dk>, Jun Yan <jun.yan at uconn.edu>,
Maintainer: S�ren H�jsgaard <sorenh at math.aau.dk>
@@ -9,7 +9,7 @@ Description: Generalized estimating equations solver for parameters in
categorical responses.
Encoding: latin1
License: GPL (>= 3)
-Packaged: 2014-09-13 05:14:48 UTC; sorenh
+Packaged: 2016-07-05 15:56:10 UTC; hornik
NeedsCompilation: yes
Repository: CRAN
-Date/Publication: 2014-09-13 08:22:14
+Date/Publication: 2016-07-05 17:59:21
diff --git a/MD5 b/MD5
index 978b0f2..2714efa 100644
--- a/MD5
+++ b/MD5
@@ -1,6 +1,6 @@
706152b8be6d8b2ca3a5ebdc9fcd8c1e *ChangeLog
-639690685bcc0878aaf422c56f09301b *DESCRIPTION
-419277c04635cf139654cefe064406fc *NAMESPACE
+ec1c80280fc44e97494d187a174a30b9 *DESCRIPTION
+9b4a39760a174ec40ed5183e8fa9b61e *NAMESPACE
96a6f5b5b46df0f9d3ac6bbc3327eada *R/fixed2Zcor.R
59e982dac0a9e5004b8290399c2a5e6d *R/geeglm-anova.R
e075605e7afd684200939ab63ae6be13 *R/geeglm.R
@@ -10,7 +10,7 @@ a5e17a48d8e1196aa1967d5758168a0e *R/internal.R
acf18753c22de2282b9a8357b7c06688 *R/rrr.R
8abbb54ea36f442f6bd9e47e89f4818b *R/summary.R
4b5e3c63a382021749596cb59f04c62d *R/zzz.R
-856de2c2b229d8ff55254176b0f52123 *build/vignette.rds
+be0bab57cd047145f8af1e91a04c5d3f *build/vignette.rds
8ef0a085392c2a6431f2f8713c60e5b5 *data/dietox.txt.gz
249971f8780df82504f54fd2b7d62252 *data/koch.txt.gz
c0e0807be2abed83152006db8dcbac5e *data/ohio.txt.gz
@@ -24,11 +24,11 @@ c01cea3c88238c320844d0d7649fc72f *inst/doc/geepack-manual.R
3be52b7e7574dc6e40ca55938a8b3069 *inst/doc/geepack-manual.Rnw
3a0bccf41d745a5d12f34922d6a87379 *inst/doc/geepack-manual.pdf
eea5c9a7a285257434fb725257ff3b9d *inst/include/famstr.h
-aa8c2c4defc681b6cc57b2f9d8bdf03b *inst/include/gee2.h
+98e267ce97f38f2e276b446118670d60 *inst/include/gee2.h
e8d36304622f6f1f68c574712205bc5d *inst/include/geese.h
3f2e8af2c1525fb2d75c1edba70454aa *inst/include/geesubs.h
-151dd77b6836f73b5fecce50696993fa *inst/include/inter.h
-5f87133114c23dbb0d7a3b386398d950 *inst/include/ordgee.h
+2ce611ce796e5966c28b5a10686fa73c *inst/include/inter.h
+d52a1fb70e140ffd538c7d4977c9470d *inst/include/ordgee.h
9dc8477a0757b19fdedc684c190f41bd *inst/include/param.h
b3184852ad60355ddb93aa6088ef8dec *inst/include/tnt/cholesky.h
44325cd2b27ac5c1f62c46b52beda7ca *inst/include/tnt/cmat.h
@@ -74,11 +74,11 @@ fc96c21e1b768ed26b82a12b1a80b10a *man/geese-internal.Rd
25ef8f9ca91a04270a892c3006c40a42 *man/ordgee.Rd
54b06bbedd91bf0aa774ee7e05a435fc *man/relRisk.Rd
8bb53f14cf0f67b02bdd966aadb484a2 *src/Makevars
-a67713e7bd2af24366a6de5161d60e16 *src/famstr.cc
+cdc0cc143af33cd5665ac112d92afdc9 *src/famstr.cc
96ddcb6778b6c316ddf5b9e27d4fcab4 *src/gee2.cc
a03f71117e827c1b67df1c8d0b2ebc50 *src/geesubs.cc
-e592864c942de117c0afb78b01d28019 *src/inter.cc
+6d10b391c5764570271035f55323a6d9 *src/inter.cc
a00d55d44890eb2796f6e01d2c778516 *src/ordgee.cc
cc4f054a5e831b0dccda7ffe2398143b *src/param.cc
-5f2f46506fe7fdeb7dc87ae35c53e4a2 *src/utils.cc
+aa7d692722f3b034aa4ff9dbe6851947 *src/utils.cc
3be52b7e7574dc6e40ca55938a8b3069 *vignettes/geepack-manual.Rnw
diff --git a/NAMESPACE b/NAMESPACE
index 4ca095a..a5a2594 100755
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -1,5 +1,13 @@
useDynLib(geepack)
+importFrom("graphics", "abline", "lines", "plot")
+importFrom("stats", "binomial", "coef", "fitted", "formula",
+ "gaussian", "glm.fit", "is.empty.model", "lm.fit", "lowess",
+ "model.extract", "model.matrix", "model.offset",
+ "model.response", "model.weights", "na.omit", "naresid",
+ "pchisq", "printCoefmat", "quasi", "residuals",
+ "summary.glm", "var")
+importFrom("utils", "head")
# maintained by Soren
export(geeglm, fixed2Zcor, anovageePrim2)
@@ -18,3 +26,4 @@ export(compCoef)
S3method(print, geese)
S3method(summary, geese)
S3method(print, summary.geese)
+
diff --git a/build/vignette.rds b/build/vignette.rds
index 3f24459..1a8d1d3 100644
Binary files a/build/vignette.rds and b/build/vignette.rds differ
diff --git a/inst/include/gee2.h b/inst/include/gee2.h
index f7f2c83..568255b 100755
--- a/inst/include/gee2.h
+++ b/inst/include/gee2.h
@@ -4,11 +4,11 @@
#include "tntsupp.h"
#include "geese.h"
-extern "C"{
+// extern "C"{
#include <R.h>
#include <Rmath.h>
#include <Rdefines.h>
-}
+// }
#include "famstr.h"
#include "param.h"
diff --git a/inst/include/inter.h b/inst/include/inter.h
index b44d711..37f4534 100755
--- a/inst/include/inter.h
+++ b/inst/include/inter.h
@@ -1,10 +1,10 @@
#ifndef INTER_H
#define INTER_H
-extern "C" {
+// extern "C" {
#include <R.h>
#include <Rdefines.h>
-}
+// }
#include "tntsupp.h"
#include "geese.h"
diff --git a/inst/include/ordgee.h b/inst/include/ordgee.h
index 5e0cfad..8fd2fcd 100755
--- a/inst/include/ordgee.h
+++ b/inst/include/ordgee.h
@@ -5,11 +5,11 @@
#include "tntsupp.h"
#include "geese.h"
-extern "C"{
+// extern "C"{
#include <R.h>
#include <Rmath.h>
#include <Rdefines.h>
-}
+// }
#include "famstr.h"
#include "param.h"
diff --git a/src/famstr.cc b/src/famstr.cc
index 5638ed7..54258ab 100755
--- a/src/famstr.cc
+++ b/src/famstr.cc
@@ -4,11 +4,10 @@ using namespace std;
#include "geese.h"
#include "utils.h"
#include "famstr.h"
-#include "float.h"
+#include <cfloat>
-extern "C" {
#include <Rmath.h>
-}
+
/*
typedef double fun1(double);
typedef double fun2(double, int);
diff --git a/src/inter.cc b/src/inter.cc
index 2dc7bcf..5f05558 100755
--- a/src/inter.cc
+++ b/src/inter.cc
@@ -3,11 +3,9 @@ using namespace std;
#include "tntsupp.h"
#include "geese.h"
-extern "C"{
#include <R.h>
#include <Rmath.h>
#include <Rdefines.h>
-}
#include "famstr.h"
#include "param.h"
diff --git a/src/utils.cc b/src/utils.cc
index 62175e2..2da2ac6 100755
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -1,10 +1,7 @@
// using namespace std;
-extern "C"{
+#include <cmath>
#include <R.h>
-}
-
-#include <math.h>
#include "tntsupp.h"
#include "geese.h"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/r-cran-geepack.git
More information about the debian-science-commits
mailing list