Skip to content

Commit

Permalink
version 0.1-2
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Papritz authored and cran-robot committed Mar 5, 2014
1 parent 07003f3 commit b50e9aa
Show file tree
Hide file tree
Showing 18 changed files with 1,059 additions and 209 deletions.
52 changes: 50 additions & 2 deletions ChangeLog
Expand Up @@ -134,5 +134,53 @@ processing col and pch arguments

2013-09-06 Andreas Papritz <papritz@env.ethz.ch>

* georob.exported.functions.R (georob, georob.control, bbsolve.control): code for solving estimating equations by BBsolve{BB} commented out (released to CRAN as version 0.1-2)
* georob.private.functions.R (compute.estimating.equations, compute.expanded.estimating.equations, estimating.eqations.xihat, estimate.xihat, georob.fit, gradient.negative.restricted.loglikelihood, negative.restr.loglikelihood, prepare.likelihood.calculations): code for solving estimating equations by BBsolve{BB} commented out (released to CRAN as version 0.1-2)
* georob.exported.functions.R (georob, georob.control, bbsolve.control): code for solving estimating equations by BBsolve{BB} commented out (released to CRAN as version 0.1-1)
* georob.private.functions.R (compute.estimating.equations, compute.expanded.estimating.equations, estimating.eqations.xihat, estimate.xihat, georob.fit, gradient.negative.restricted.loglikelihood, negative.restr.loglikelihood, prepare.likelihood.calculations): code for solving estimating equations by BBsolve{BB} commented out (released to CRAN as version 0.1-1)


2014-01-23 Andreas Papritz <papritz@env.ethz.ch>

* georob.private.functions.R (prepare.likelihood.calculations): correct comparison of trial parameter values with safe.param


2014-02-06 Andreas Papritz <papritz@env.ethz.ch>

* georob.exported.functions (georob): correcting error that occurred for rank-deficient design matrices
* georob.private.functions.R (gerorob.fit): correcting error that occurred for rank-deficient design matrices


2014-02-11 Andreas Papritz <papritz@env.ethz.ch>

* georob.predict.R (predict.georob): suppressing warnings caused by use of version 2 function of package RandomFields
* georob.private.functions.R (gcr, compute.semivariance): suppressing warnings caused by use of version 2 function of package RandomFields


2014-02-19 Andreas Papritz <papritz@env.ethz.ch>

* georob.exported.functions (georob): changes for now exported function robMD{robustbase}, correcting error when model contains offset
* georob.private.functions.R (gerorob.fit): correcting error when model contains offset
* georob.predict.R (predict.georob): correcting error when model contains offset
* georob.S3methods.R (waldtest.georob): handling verbose output when re-fitting model


2014-02-21 Andreas Papritz <papritz@env.ethz.ch>

* georob.cv.R (cv.georob): changes for dealing with problem when factor are very unbalanced


2014-02-27 Andreas Papritz <papritz@env.ethz.ch>

* georob.S3methods.R (deviance.georob): computing 'pseudo' deviance for robustly fitted models


2014-03-01 Andreas Papritz <papritz@env.ethz.ch>

* georob.S3methods.R (add1.georob, drop1.georob, extractAIC.georob, step, step.default, step.georob): functions for stepwise selection of fixed-effects terms


2014-03-05 Andreas Papritz <papritz@env.ethz.ch>

* georob.private.functions.R (compute.semivariance, gar): changes for RandomFields version 3
* georob.predict.R (predict.georobcd R. ): changes for RandomFields version 3


Expand Down
8 changes: 4 additions & 4 deletions DESCRIPTION
@@ -1,15 +1,15 @@
Package: georob
Type: Package
Title: Robust Geostatistical Analysis of Spatial Data
Version: 0.1-1
Version: 0.1-2
Date: 2013-09-06
Authors@R: c(
person( "Andreas", "Papritz", role = c( "cre", "aut" ),
email = "andreas.papritz@env.ethz.ch" ),
person( "Cornelia", "Schwierz", role = "ctb" ))
Depends: R(>= 2.14.0), sp(>= 0.9-60)
Imports: constrainedKriging(>= 0.2-1), lmtest, nlme, nleqslv, quantreg,
RandomFields(>= 2.0.55), robustbase(>= 0.9-5)
RandomFields(>= 3.0.10), robustbase(>= 0.90-2)
Suggests: geoR
Description: The georob package provides functions for fitting linear models
with spatially correlated errors by robust and Gaussian Restricted
Expand All @@ -18,10 +18,10 @@ Description: The georob package provides functions for fitting linear models
cross-validation and for unbiased back-transformation of kriging
predictions of log-transformed data.
License: GPL (>= 2)
Packaged: 2013-09-06 16:02:31 UTC; papritz
Packaged: 2014-03-05 13:11:49 UTC; papritz
Author: Andreas Papritz [cre, aut],
Cornelia Schwierz [ctb]
Maintainer: Andreas Papritz <andreas.papritz@env.ethz.ch>
NeedsCompilation: no
Repository: CRAN
Date/Publication: 2013-09-06 22:26:35
Date/Publication: 2014-03-05 16:41:49
33 changes: 17 additions & 16 deletions MD5
@@ -1,26 +1,27 @@
a1d48d5591dbcb607a7662c100d85157 *ChangeLog
9b7bd2ef508e297284032709fbf50af2 *DESCRIPTION
ef6e150c23e65c4cff172d666d412029 *NAMESPACE
e954ddad8b251b4e602e671f2143ce5a *NEWS
f1caeb8efe2c5c9b1cc9cbc1cbf9953a *R/georob.S3methods.R
8b4950fe9221f1cfc98880ae0e830c22 *R/georob.cv.R
78aa8f1e637bd010f9095d9c789ec1fa *R/georob.exported.functions.R
9bcd392930a046c55916f3c75b174f53 *ChangeLog
c770a4532c623c9e476292e195a7b853 *DESCRIPTION
a1ad734aaae6f7f8c2edec0590bb29f6 *NAMESPACE
3a15a70dc5c4822b32c4e660394c0c98 *NEWS
c58eb2d3c7cba32c720b1d9257fa29c9 *R/georob.S3methods.R
f7f8b2d84a4b37a1268322dd4c7a83d6 *R/georob.cv.R
1913920738e2271563dde7a08832d21a *R/georob.exported.functions.R
2de0430016d74d0f5cd9e05d930ac524 *R/georob.lgnpp.R
f463cb2f22089f5b9ce57bc72cf869bf *R/georob.predict.R
7443311ae7361d4d425dec5fb4a2d6a5 *R/georob.private.functions.R
05e76687ede930f3fb1f412427f30978 *R/georob.predict.R
a73679e3e73edc9bf9d8c2f9cdce54a9 *R/georob.private.functions.R
eaeffd2851882472d9d93155ce7d010e *R/variogram.R
37024b25066668e93df4dcbd5e12e036 *demo/00Index
92abfbadc878aeeeaefa8721f341fe8c *demo/georob_example.R
e4554b84fbc6a2362bf31b1fc46ca36d *man/S3methods.georob.Rd
20c51be7464bc83ffcdf2bc55971a0ad *man/S3methods.georob.Rd
88c3f25bd944066ba6bc8acc62f83a23 *man/compress.Rd
c317de9d9b66e9222c125e5ae382425a *man/cv.Rd
e9646cc711d06c40a6f7aa8eb8d6a403 *man/cv.georob.Rd
e2e2b0f6907928407faa9053b2807994 *man/cv.georob.Rd
807b4fe7b884b93b8f83ff95e1396597 *man/fit.variogram.model.Rd
1bb0d0e32b9686103ea49308bf61e3c6 *man/georob-package.Rd
dbb77953b159d41211a4d0ef6a0cfdd2 *man/georob.Rd
b4f48a8dbf23c67b7ed32090377337af *man/georob.control.Rd
d96b0ecdd0867969842fe24e058492bd *man/georobObject.Rd
d6fec855e33e7a4b8b749dfddd99699d *man/internal.functions.Rd
99523a774724b63f997131898234a3a7 *man/georob-package.Rd
083cea92123351d717c6ba6e99544c87 *man/georob.Rd
2c482f91fbc6dc98b3a83dc66104991e *man/georob.control.Rd
d12640f096fc0aa8bb1e75795a81e02b *man/georobModelBuilding.Rd
46899f02770c1ac72dc5be5690a49e77 *man/georobObject.Rd
e58b6961c809a73e58a3d18f6abcb4b2 *man/internal.functions.Rd
cbd37be9746cd88259e5d6bfbf4b94a4 *man/lgnpp.Rd
eb51a566de8d3ba54e945b58261d7094 *man/param.names.Rd
dfa6007c27b8206e6ebbdeec49935f08 *man/plot.georob.Rd
Expand Down
17 changes: 15 additions & 2 deletions NAMESPACE
Expand Up @@ -6,8 +6,8 @@ importFrom( lmtest, waldtest, waldtest.default )
importFrom( nlme, fixef, fixed.effects, ranef, random.effects )
importFrom( nleqslv, nleqslv )
importFrom( quantreg, rq.fit )
importFrom( RandomFields, Variogram )
importFrom( robustbase, lmrob.control, lmrob.fit, Qn, summarizeRobWeights )
importFrom( RandomFields, RFvariogram, RFoldstyle, RFoptions)
importFrom( robustbase, lmrob.control, lmrob.fit, Qn, robMD, summarizeRobWeights )

# exported functions

Expand Down Expand Up @@ -35,13 +35,17 @@ export(
ranef, # ok export of generic ranef{nlme}
rq.control, # ok
sample.variogram, # ok
step, # ok
validate.predictions, # ok
waldtest # ok export of generic waldtest{lmtest}
)

# documented but unexported functions
#
# add1.georob, # ok
# deviance.georob, # ok
# drop1.georob, # ok
# exportAIC.georob, # ok
# fixed.effects.georob, # ok
# fixef.georob, # ok
# lines.fitted.variogram, # ok
Expand All @@ -68,6 +72,8 @@ export(
# rstandard.georob, # ok
# rstudent.georob, # ok
# rstudent.cv.georob, # ok
# step.default, # ok
# step.georob, # ok
# summary.fitted.variogram, # ok
# summary.georob, # ok
# summary.sample.variogram, # ok
Expand All @@ -94,9 +100,13 @@ export(
## gradient.negative.restricted.loglikelihood,
## negative.restr.loglikelihood,
## prepare.likelihood.calculations,
## safe_pchisq,
## update.xihat

S3method( add1, georob )
S3method( deviance, georob )
S3method( drop1, georob )
S3method( extractAIC, georob )
S3method( fixed.effects, georob )
S3method( fixef, georob )
S3method( lines, fitted.variogram )
Expand All @@ -123,12 +133,15 @@ S3method( resid, georob )
S3method( residuals, georob )
S3method( rstandard, georob )
S3method( rstudent, georob )
S3method( step, default )
S3method( step, georob )
S3method( summary, fitted.variogram )
S3method( summary, georob )
S3method( summary, sample.variogram )
S3method( summary, cv.georob )
S3method( vcov, georob )
S3method( waldtest, georob )
# S3method( cv, default )
S3method( cv, georob )
# S3method( cv, likGRF )
# S3method( cv, variomodel )
Expand Down
2 changes: 2 additions & 0 deletions NEWS
@@ -1 +1,3 @@
2012-12-14 georob Version 0.1-0 released!
2013-09-06 georob Version 0.1-1 released to CRAN

0 comments on commit b50e9aa

Please sign in to comment.