Skip to content

Commit d1ffbb7

Browse files
edzeredzer
committed
CRAN r-devel notes/diffs
1 parent 9e25ac6 commit d1ffbb7

File tree

8 files changed

+209
-206
lines changed

8 files changed

+209
-206
lines changed

‎DESCRIPTION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: gstat
2-
Version: 2.1-2
2+
Version: 2.1-3
33
Title: Spatial and Spatio-Temporal Geostatistical Modelling, Prediction
44
and Simulation
55
Authors@R: c(person(given = "Edzer",

‎inst/ChangeLog‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
2025-01-27 edzer <[email protected]>
2+
3+
* DESCRIPTION: CRAN NOTE: packages used in demo
4+
5+
2024-12-16 edzer <[email protected]>
6+
7+
* inst/ChangeLog, tests/stars.R, tests/stars.Rout.save,
8+
tests/vdist.R, tests/vdist.Rout.save: tidy
9+
10+
2024-12-16 edzer <[email protected]>
11+
12+
* R/predict.gstat.R: fix #145
13+
114
2024-09-03 edzer <[email protected]>
215

316
* inst/ChangeLog, tests/stars.Rout.save: clean test output

‎man/sic2004.Rd‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,6 @@ Data: the German Federal Office for Radiation Protection (BfS),
9595
data provided by Gregoire Dubois, R compilation
9696
by Edzer Pebesma. }
9797

98-
\references{
99-
\url{https://wiki.52north.org/bin/view/AI_GEOSTATS/WebHome}
100-
}
101-
10298
\keyword{datasets}
10399
\examples{
104100
data(sic2004)

‎man/sic97.Rd‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@
66
\title{ Spatial Interpolation Comparison 1997 data set: Swiss Rainfall}
77
\description{
88
The text below is copied from the data item at ai-geostats,
9-
\url{https://wiki.52north.org/bin/view/AI_GEOSTATS/WebHome}
10-
9+
(link no longer working).
1110
}
1211

1312
\format{
@@ -30,8 +29,6 @@ data(sic97) #
3029
Gregoire Dubois and others.
3130
}
3231

33-
\references{ \url{https://wiki.52north.org/bin/view/AI_GEOSTATS/WebHome}}
34-
3532
\keyword{datasets}
3633
\examples{
3734
data(sic97)

‎man/walker.Rd‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,8 @@ Applied Geostatistics
2626
by Edward H. Isaaks, R. Mohan Srivastava;
2727
Oxford University Press.
2828
}
29-
\note{
30-
This data sets was obtained from the data sets on
31-
ai-geostats,
32-
\url{https://wiki.52north.org/bin/view/AI_GEOSTATS/WebHome}
33-
}
29+
\note{ This data sets was obtained from the data sets on
30+
ai-geostats (link no longer functioning) }
3431
\keyword{datasets}
3532
\examples{
3633
library(sp)

‎tests/cv.Rout.save‎

Lines changed: 102 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,102 @@
1-
2-
R version 3.6.0 (2019-04-26) -- "Planting of a Tree"
3-
Copyright (C) 2019 The R Foundation for Statistical Computing
4-
Platform: x86_64-pc-linux-gnu (64-bit)
5-
6-
R is free software and comes with ABSOLUTELY NO WARRANTY.
7-
You are welcome to redistribute it under certain conditions.
8-
Type 'license()' or 'licence()' for distribution details.
9-
10-
R is a collaborative project with many contributors.
11-
Type 'contributors()' for more information and
12-
'citation()' on how to cite R or R packages in publications.
13-
14-
Type 'demo()' for some demos, 'help()' for on-line help, or
15-
'help.start()' for an HTML browser interface to help.
16-
Type 'q()' to quit R.
17-
18-
> # try bivariate cokriging; cross validate first variable
19-
> library(sp)
20-
> data(meuse)
21-
> library(gstat)
22-
> g=gstat(NULL, "log-zinc", log(zinc)~1, ~x+y, meuse, nmax=10)
23-
> g=gstat(g, "log-lead", log(lead)~1, ~x+y, meuse, nmax=10)
24-
> g=gstat(g, "log-copper", log(copper)~1, ~x+y, meuse, nmax=10)
25-
> v=variogram(g)
26-
> g=gstat(g, model=vgm(1, "Sph", 1000), fill.all=T)
27-
> g=fit.lmc(v, g)
28-
> g
29-
data:
30-
log-zinc : formula = log(zinc)`~`1 ; data dim = 155 x 12 nmax = 10
31-
log-lead : formula = log(lead)`~`1 ; data dim = 155 x 12 nmax = 10
32-
log-copper : formula = log(copper)`~`1 ; data dim = 155 x 12 nmax = 10
33-
variograms:
34-
model psill range
35-
log-zinc Sph 0.7132435 1000
36-
log-lead Sph 0.6133020 1000
37-
log-copper Sph 0.3634211 1000
38-
log-zinc.log-lead Sph 0.6367012 1000
39-
log-zinc.log-copper Sph 0.4570044 1000
40-
log-lead.log-copper Sph 0.3934910 1000
41-
~x + y
42-
> set.seed(13131)
43-
> summary(gstat.cv(g, remove.all=TRUE, nfold=5))
44-
Intrinsic Correlation found. Good.
45-
[using ordinary cokriging]
46-
Intrinsic Correlation found. Good.
47-
[using ordinary cokriging]
48-
Intrinsic Correlation found. Good.
49-
[using ordinary cokriging]
50-
Intrinsic Correlation found. Good.
51-
[using ordinary cokriging]
52-
Intrinsic Correlation found. Good.
53-
[using ordinary cokriging]
54-
log.zinc.pred log.zinc.var observed residual
55-
Min. :4.779 Min. :0.05426 Min. :4.727 Min. :-1.317697
56-
1st Qu.:5.396 1st Qu.:0.10872 1st Qu.:5.288 1st Qu.:-0.230224
57-
Median :5.858 Median :0.13745 Median :5.787 Median :-0.034374
58-
Mean :5.895 Mean :0.15249 Mean :5.886 Mean :-0.009094
59-
3rd Qu.:6.367 3rd Qu.:0.18303 3rd Qu.:6.514 3rd Qu.: 0.244075
60-
Max. :7.358 Max. :0.60571 Max. :7.517 Max. : 1.414147
61-
zscore fold x y
62-
Min. :-3.35764 Min. :1.000 Min. :178605 Min. :329714
63-
1st Qu.:-0.58683 1st Qu.:2.000 1st Qu.:179371 1st Qu.:330762
64-
Median :-0.10755 Median :3.000 Median :179991 Median :331633
65-
Mean :-0.02766 Mean :2.852 Mean :180005 Mean :331635
66-
3rd Qu.: 0.70691 3rd Qu.:4.000 3rd Qu.:180630 3rd Qu.:332463
67-
Max. : 3.43370 Max. :5.000 Max. :181390 Max. :333611
68-
Warning message:
69-
In checkNames(value) :
70-
attempt to set invalid names: this may lead to problems later on. See ?make.names
71-
> summary(gstat.cv(g, remove.all=FALSE, nfold=5))
72-
Intrinsic Correlation found. Good.
73-
[using ordinary cokriging]
74-
Intrinsic Correlation found. Good.
75-
[using ordinary cokriging]
76-
Intrinsic Correlation found. Good.
77-
[using ordinary cokriging]
78-
Intrinsic Correlation found. Good.
79-
[using ordinary cokriging]
80-
Intrinsic Correlation found. Good.
81-
[using ordinary cokriging]
82-
log.zinc.pred log.zinc.var observed residual
83-
Min. :4.644 Min. :0.002371 Min. :4.727 Min. :-0.4190977
84-
1st Qu.:5.308 1st Qu.:0.004975 1st Qu.:5.288 1st Qu.:-0.0773273
85-
Median :5.777 Median :0.005875 Median :5.787 Median : 0.0006165
86-
Mean :5.883 Mean :0.006609 Mean :5.886 Mean : 0.0026164
87-
3rd Qu.:6.422 3rd Qu.:0.007419 3rd Qu.:6.514 3rd Qu.: 0.0825770
88-
Max. :7.676 Max. :0.027247 Max. :7.517 Max. : 0.4659503
89-
zscore fold x y
90-
Min. :-4.793253 Min. :1.000 Min. :178605 Min. :329714
91-
1st Qu.:-1.080725 1st Qu.:2.000 1st Qu.:179371 1st Qu.:330762
92-
Median : 0.007242 Median :3.000 Median :179991 Median :331633
93-
Mean : 0.050487 Mean :2.974 Mean :180005 Mean :331635
94-
3rd Qu.: 1.117469 3rd Qu.:4.000 3rd Qu.:180630 3rd Qu.:332463
95-
Max. : 6.475831 Max. :5.000 Max. :181390 Max. :333611
96-
Warning message:
97-
In checkNames(value) :
98-
attempt to set invalid names: this may lead to problems later on. See ?make.names
99-
>
100-
> proc.time()
101-
user system elapsed
102-
0.614 0.050 0.655
1+
2+
R Under development (unstable) (2025-02-03 r87683 ucrt) -- "Unsuffered Consequences"
3+
Copyright (C) 2025 The R Foundation for Statistical Computing
4+
Platform: x86_64-w64-mingw32/x64
5+
6+
R is free software and comes with ABSOLUTELY NO WARRANTY.
7+
You are welcome to redistribute it under certain conditions.
8+
Type 'license()' or 'licence()' for distribution details.
9+
10+
R is a collaborative project with many contributors.
11+
Type 'contributors()' for more information and
12+
'citation()' on how to cite R or R packages in publications.
13+
14+
Type 'demo()' for some demos, 'help()' for on-line help, or
15+
'help.start()' for an HTML browser interface to help.
16+
Type 'q()' to quit R.
17+
18+
> # try bivariate cokriging; cross validate first variable
19+
> library(sp)
20+
> data(meuse)
21+
> library(gstat)
22+
> g=gstat(NULL, "log-zinc", log(zinc)~1, ~x+y, meuse, nmax=10)
23+
> g=gstat(g, "log-lead", log(lead)~1, ~x+y, meuse, nmax=10)
24+
> g=gstat(g, "log-copper", log(copper)~1, ~x+y, meuse, nmax=10)
25+
> v=variogram(g)
26+
> g=gstat(g, model=vgm(1, "Sph", 1000), fill.all=T)
27+
> g=fit.lmc(v, g)
28+
> g
29+
data:
30+
log-zinc : formula = log(zinc)`~`1 ; data dim = 155 x 12 nmax = 10
31+
log-lead : formula = log(lead)`~`1 ; data dim = 155 x 12 nmax = 10
32+
log-copper : formula = log(copper)`~`1 ; data dim = 155 x 12 nmax = 10
33+
variograms:
34+
model psill range
35+
log-zinc Sph 0.7132435 1000
36+
log-lead Sph 0.6133020 1000
37+
log-copper Sph 0.3634211 1000
38+
log-zinc.log-lead Sph 0.6367012 1000
39+
log-zinc.log-copper Sph 0.4570044 1000
40+
log-lead.log-copper Sph 0.3934910 1000
41+
~x + y
42+
> set.seed(13131)
43+
> summary(gstat.cv(g, remove.all=TRUE, nfold=5))
44+
Intrinsic Correlation found. Good.
45+
[using ordinary cokriging]
46+
Intrinsic Correlation found. Good.
47+
[using ordinary cokriging]
48+
Intrinsic Correlation found. Good.
49+
[using ordinary cokriging]
50+
Intrinsic Correlation found. Good.
51+
[using ordinary cokriging]
52+
Intrinsic Correlation found. Good.
53+
[using ordinary cokriging]
54+
log.zinc.pred log.zinc.var observed residual
55+
Min. :4.779 Min. :0.05426 Min. :4.727 Min. :-1.317697
56+
1st Qu.:5.396 1st Qu.:0.10872 1st Qu.:5.288 1st Qu.:-0.230224
57+
Median :5.858 Median :0.13745 Median :5.787 Median :-0.034374
58+
Mean :5.895 Mean :0.15249 Mean :5.886 Mean :-0.009094
59+
3rd Qu.:6.367 3rd Qu.:0.18303 3rd Qu.:6.514 3rd Qu.: 0.244075
60+
Max. :7.358 Max. :0.60571 Max. :7.517 Max. : 1.414147
61+
zscore fold x y
62+
Min. :-3.35764 Min. :1.000 Min. :178605 Min. :329714
63+
1st Qu.:-0.58683 1st Qu.:2.000 1st Qu.:179371 1st Qu.:330762
64+
Median :-0.10755 Median :3.000 Median :179991 Median :331633
65+
Mean :-0.02766 Mean :2.852 Mean :180005 Mean :331635
66+
3rd Qu.: 0.70691 3rd Qu.:4.000 3rd Qu.:180630 3rd Qu.:332463
67+
Max. : 3.43370 Max. :5.000 Max. :181390 Max. :333611
68+
Warning message:
69+
In checkNames(value) :
70+
attempt to set invalid names: this may lead to problems later on. See ?make.names
71+
> summary(gstat.cv(g, remove.all=FALSE, nfold=5))
72+
Intrinsic Correlation found. Good.
73+
[using ordinary cokriging]
74+
Intrinsic Correlation found. Good.
75+
[using ordinary cokriging]
76+
Intrinsic Correlation found. Good.
77+
[using ordinary cokriging]
78+
Intrinsic Correlation found. Good.
79+
[using ordinary cokriging]
80+
Intrinsic Correlation found. Good.
81+
[using ordinary cokriging]
82+
log.zinc.pred log.zinc.var observed residual
83+
Min. :4.644 Min. :0.002371 Min. :4.727 Min. :-0.4190976
84+
1st Qu.:5.308 1st Qu.:0.004975 1st Qu.:5.288 1st Qu.:-0.0773273
85+
Median :5.777 Median :0.005875 Median :5.787 Median : 0.0006165
86+
Mean :5.883 Mean :0.006609 Mean :5.886 Mean : 0.0026164
87+
3rd Qu.:6.422 3rd Qu.:0.007419 3rd Qu.:6.514 3rd Qu.: 0.0825770
88+
Max. :7.676 Max. :0.027247 Max. :7.517 Max. : 0.4659503
89+
zscore fold x y
90+
Min. :-4.793253 Min. :1.000 Min. :178605 Min. :329714
91+
1st Qu.:-1.080725 1st Qu.:2.000 1st Qu.:179371 1st Qu.:330762
92+
Median : 0.007242 Median :3.000 Median :179991 Median :331633
93+
Mean : 0.050487 Mean :2.974 Mean :180005 Mean :331635
94+
3rd Qu.: 1.117469 3rd Qu.:4.000 3rd Qu.:180630 3rd Qu.:332463
95+
Max. : 6.475831 Max. :5.000 Max. :181390 Max. :333611
96+
Warning message:
97+
In checkNames(value) :
98+
attempt to set invalid names: this may lead to problems later on. See ?make.names
99+
>
100+
> proc.time()
101+
user system elapsed
102+
1.31 0.09 1.39

‎tests/cv3d.Rout.save‎

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,48 @@
1-
2-
R version 3.6.2 (2019-12-12) -- "Dark and Stormy Night"
3-
Copyright (C) 2019 The R Foundation for Statistical Computing
4-
Platform: x86_64-pc-linux-gnu (64-bit)
5-
6-
R is free software and comes with ABSOLUTELY NO WARRANTY.
7-
You are welcome to redistribute it under certain conditions.
8-
Type 'license()' or 'licence()' for distribution details.
9-
10-
R is a collaborative project with many contributors.
11-
Type 'contributors()' for more information and
12-
'citation()' on how to cite R or R packages in publications.
13-
14-
Type 'demo()' for some demos, 'help()' for on-line help, or
15-
'help.start()' for an HTML browser interface to help.
16-
Type 'q()' to quit R.
17-
18-
> options(digits = 4)
19-
> set.seed(1131)
20-
> d = data.frame(x=runif(50),y=runif(50),z=runif(50),v=rnorm(50))
21-
> library(gstat)
22-
> xx = krige.cv(v~1,~x+y+z,d,model=vgm(1,"Exp",1), verbose=F, set=list(debug=0))
23-
> summary(xx)
24-
var1.pred var1.var observed residual
25-
Min. :-1.163 Min. :0.116 Min. :-2.240 Min. :-2.1755
26-
1st Qu.:-0.571 1st Qu.:0.175 1st Qu.:-0.876 1st Qu.:-0.7881
27-
Median :-0.201 Median :0.192 Median :-0.219 Median : 0.1175
28-
Mean :-0.165 Mean :0.208 Mean :-0.142 Mean : 0.0233
29-
3rd Qu.: 0.161 3rd Qu.:0.240 3rd Qu.: 0.500 3rd Qu.: 0.8508
30-
Max. : 1.085 Max. :0.426 Max. : 1.857 Max. : 2.5224
31-
zscore fold x y
32-
Min. :-5.168 Min. : 1.0 Min. :0.0068 Min. :0.0034
33-
1st Qu.:-1.875 1st Qu.:13.2 1st Qu.:0.2397 1st Qu.:0.2466
34-
Median : 0.245 Median :25.5 Median :0.4867 Median :0.4525
35-
Mean : 0.017 Mean :25.5 Mean :0.4997 Mean :0.4969
36-
3rd Qu.: 2.020 3rd Qu.:37.8 3rd Qu.:0.7473 3rd Qu.:0.7394
37-
Max. : 7.354 Max. :50.0 Max. :0.9875 Max. :0.9872
38-
z
39-
Min. :0.0016
40-
1st Qu.:0.1865
41-
Median :0.4485
42-
Mean :0.4714
43-
3rd Qu.:0.7240
44-
Max. :0.9942
45-
>
46-
> proc.time()
47-
user system elapsed
48-
0.776 0.050 0.815
1+
2+
R Under development (unstable) (2025-02-03 r87683 ucrt) -- "Unsuffered Consequences"
3+
Copyright (C) 2025 The R Foundation for Statistical Computing
4+
Platform: x86_64-w64-mingw32/x64
5+
6+
R is free software and comes with ABSOLUTELY NO WARRANTY.
7+
You are welcome to redistribute it under certain conditions.
8+
Type 'license()' or 'licence()' for distribution details.
9+
10+
R is a collaborative project with many contributors.
11+
Type 'contributors()' for more information and
12+
'citation()' on how to cite R or R packages in publications.
13+
14+
Type 'demo()' for some demos, 'help()' for on-line help, or
15+
'help.start()' for an HTML browser interface to help.
16+
Type 'q()' to quit R.
17+
18+
> options(digits = 4)
19+
> set.seed(1131)
20+
> d = data.frame(x=runif(50),y=runif(50),z=runif(50),v=rnorm(50))
21+
> library(gstat)
22+
> xx = krige.cv(v~1,~x+y+z,d,model=vgm(1,"Exp",1), verbose=F, set=list(debug=0))
23+
> summary(xx)
24+
var1.pred var1.var observed residual
25+
Min. :-1.163 Min. :0.116 Min. :-2.240 Min. :-2.1755
26+
1st Qu.:-0.571 1st Qu.:0.175 1st Qu.:-0.876 1st Qu.:-0.7881
27+
Median :-0.201 Median :0.192 Median :-0.219 Median : 0.1175
28+
Mean :-0.165 Mean :0.208 Mean :-0.142 Mean : 0.0233
29+
3rd Qu.: 0.161 3rd Qu.:0.240 3rd Qu.: 0.501 3rd Qu.: 0.8508
30+
Max. : 1.085 Max. :0.426 Max. : 1.857 Max. : 2.5224
31+
zscore fold x y
32+
Min. :-5.1678 Min. : 1.0 Min. :0.00678 Min. :0.0034
33+
1st Qu.:-1.8749 1st Qu.:13.2 1st Qu.:0.23966 1st Qu.:0.2466
34+
Median : 0.2453 Median :25.5 Median :0.48668 Median :0.4525
35+
Mean : 0.0167 Mean :25.5 Mean :0.49966 Mean :0.4969
36+
3rd Qu.: 2.0201 3rd Qu.:37.8 3rd Qu.:0.74730 3rd Qu.:0.7394
37+
Max. : 7.3541 Max. :50.0 Max. :0.98754 Max. :0.9872
38+
z
39+
Min. :0.00164
40+
1st Qu.:0.18646
41+
Median :0.44850
42+
Mean :0.47142
43+
3rd Qu.:0.72403
44+
Max. :0.99420
45+
>
46+
> proc.time()
47+
user system elapsed
48+
1.23 0.17 1.39

0 commit comments

Comments
 (0)