Skip to content

Commit

Permalink
version 0.1-4
Browse files Browse the repository at this point in the history
  • Loading branch information
Andreas Papritz authored and cran-robot committed Jun 2, 2014
1 parent 2441d91 commit 3161e25
Show file tree
Hide file tree
Showing 24 changed files with 370 additions and 279 deletions.
21 changes: 20 additions & 1 deletion ChangeLog
Expand Up @@ -201,7 +201,7 @@ processing col and pch arguments
* georob.S3methods.R (add1.georob, drop1.georob, step.georob): changes in functions for reducing memory demand


2014-04-23 Andreas Papritz <papritz@env.ethz.ch>
2014-05-08 Andreas Papritz <papritz@env.ethz.ch>

* variogram.R (plot.georob,lines.georob): changes for plotting covariances and correlations

Expand All @@ -215,4 +215,23 @@ processing col and pch arguments
* variogram.R (fit.variogram.model): changes for version 3 of RandomFields


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

* georob.exported.functions.R (georob) changes for selecting intitial.param and initial.method


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

* georob.cv.R (georob.cv) catching error when all variogram parameters are fixed
* georob.exported.functions.R (georob, param.bounds, param.names) minor changes in arguments
* georob.predict.R (predict.georob) further changes for version 3 of RandomFields
* georob.private.functions.R (georob.fit) change in check for initial variogram parameter values
* variogram.R (fit.variogram.model) minor changes in arguments


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

* georob.exported.functions.R (georob) partial matching of names of variogram parameters
* georob.exported.functions.R (georob.control) new default value for argument irwls.reltol


Expand Down
8 changes: 4 additions & 4 deletions DESCRIPTION
@@ -1,8 +1,8 @@
Package: georob
Type: Package
Title: Robust Geostatistical Analysis of Spatial Data
Version: 0.1-3
Date: 2014-05-15
Version: 0.1-4
Date: 2014-06-02
Authors@R: c(
person( "Andreas", "Papritz", role = c( "cre", "aut" ),
email = "andreas.papritz@env.ethz.ch" ),
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: 2014-05-15 16:14:47 UTC; papritz
Packaged: 2014-06-02 14:19:54 UTC; papritz
Author: Andreas Papritz [cre, aut],
Cornelia Schwierz [ctb]
Maintainer: Andreas Papritz <andreas.papritz@env.ethz.ch>
NeedsCompilation: no
Repository: CRAN
Date/Publication: 2014-05-15 18:27:25
Date/Publication: 2014-06-02 17:25:30
46 changes: 23 additions & 23 deletions MD5
@@ -1,30 +1,30 @@
60a75c5fc661d22bcabde6f460d3614e *ChangeLog
a13f977a933a8e70a5cec0de710e8a4a *DESCRIPTION
8bb937b921891361008847c603bd6f04 *ChangeLog
f82cb76272a53aa8b7d784be0f58dd8b *DESCRIPTION
a1ad734aaae6f7f8c2edec0590bb29f6 *NAMESPACE
81bd0d77d2ea01aae6836b8da10796ad *NEWS
3ad956fc91ce51ed8b3c60b6408858f1 *NEWS
a4b8f9a82635509f338031bb123c91f4 *R/georob.S3methods.R
bfdca841d6452712b1aa62bdd7baf837 *R/georob.cv.R
86bf65a87e34aee6d407e9a80ce0abfe *R/georob.exported.functions.R
c8576ee583e07e390a711cf0964676b4 *R/georob.cv.R
197dea444856c0f022aa98a0da46dec5 *R/georob.exported.functions.R
2de0430016d74d0f5cd9e05d930ac524 *R/georob.lgnpp.R
f2fcc47e192cbfd14109189a8d4dde6a *R/georob.predict.R
5fe572e71ce2125e7073f2454a045896 *R/georob.private.functions.R
2f9924f55bc976c137646db3e10eb7ec *R/variogram.R
204844d0150f47b6feeafb08d34f9fee *R/georob.predict.R
84a4bb9ed2b64bdd44bcfdeaa507d893 *R/georob.private.functions.R
6c9553776c891267bbeafdbbc81b8d28 *R/variogram.R
37024b25066668e93df4dcbd5e12e036 *demo/00Index
92abfbadc878aeeeaefa8721f341fe8c *demo/georob_example.R
20c51be7464bc83ffcdf2bc55971a0ad *man/S3methods.georob.Rd
88c3f25bd944066ba6bc8acc62f83a23 *man/compress.Rd
9f74673bd454340178492625f89bed6e *demo/georob_example.R
59fcec3fd19424081d5204822faac195 *man/S3methods.georob.Rd
4fa389c6e452874af4e79bb102647688 *man/compress.Rd
c317de9d9b66e9222c125e5ae382425a *man/cv.Rd
e2e2b0f6907928407faa9053b2807994 *man/cv.georob.Rd
fd01fe0d0471f44f72b7c5e2b4bcca8f *man/fit.variogram.model.Rd
78cebc67e559d028def9c5192c1c5345 *man/georob-package.Rd
a282f23381614449713ac0c908d220f9 *man/georob.Rd
e32902267e89de9b372d802f3b97b313 *man/georob.control.Rd
9c8b10c8bd9cb2a487be6b02221d2e93 *man/georobModelBuilding.Rd
46899f02770c1ac72dc5be5690a49e77 *man/georobObject.Rd
9816b6cd43211c16b0c8effbf07b792f *man/cv.georob.Rd
45d3ac0416dc4005c809b6ab21c54ce8 *man/fit.variogram.model.Rd
000fe78a681ea027884e590b20fdcbc4 *man/georob-package.Rd
fdd4c590b982207c113d0113ce31861a *man/georob.Rd
33052a50532b3550256be8e258e91692 *man/georob.control.Rd
066cb454b8f97447d3e7fd4034c3ce4d *man/georobModelBuilding.Rd
601d2749c85c13072a19b6829faccedb *man/georobObject.Rd
e58b6961c809a73e58a3d18f6abcb4b2 *man/internal.functions.Rd
4fdd261e5af0eaaf76de74d20511eb7f *man/lgnpp.Rd
4d05a621402f5eb0c441a2dcf9483190 *man/param.names.Rd
2250db60cba1864d6b543473f63b7f8a *man/plot.georob.Rd
225ae731fb08421a6ac3081ce6a5a02f *man/predict.georob.Rd
96bf7c713b6c57170c097e37b55cfdbc *man/lgnpp.Rd
7e4a6d89f3cc2bd87ffa7f75a142fc20 *man/param.names.Rd
d72f1d59e607adffde5547f294e68b50 *man/plot.georob.Rd
cf5ee5eb9f7981579c4bfd5183ffab76 *man/predict.georob.Rd
7742eda8db94dd094e2a1fce6406a342 *man/sample.variogram.Rd
68a14642d34ae88c608a400dd0dc65cf *man/validate.predictions.Rd
fe907d44b7e8b79785294d4fe3cfe6e2 *man/validate.predictions.Rd
1 change: 1 addition & 0 deletions NEWS
@@ -1,4 +1,5 @@
2012-12-14 georob Version 0.1-0 released!
2013-09-06 georob Version 0.1-1 released to CRAN
2014-05-15 georob Version 0.1-3 released to CRAN
2014-06-02 georob Version 0.1-4 released to CRAN

15 changes: 14 additions & 1 deletion R/georob.cv.R
Expand Up @@ -62,7 +62,8 @@ cv.georob <-
## 2013-07-05 AP return "variogram.model" as part of fit componnent
## 2014-02-21 AP catching problem when factor are very unbalanced
## 2014-05-15 AP changes for version 3 of RandomFields

## 2014-05-28 AP catching error when all variogram parameters are fixed

## auxiliary function that fits the model and computes the predictions of
## a cross-validation set

Expand Down Expand Up @@ -164,6 +165,18 @@ cv.georob <-
## end cv function
}

## check consistency of arguments

if( !any( c( fit.param, fit.aniso ) ) && re.estimate ){
re.estimate <- FALSE
cat(
"re.estimate set equal to FALSE because all variogram parameters are fixed\n\n"
)
warnings(
"re.estimate set equal to FALSE because all variogram parameters are fixed"
)
}

mfl.action <- match.arg( mfl.action )

## update terms of object is formula is provided
Expand Down

0 comments on commit 3161e25

Please sign in to comment.