Skip to content

Commit aa0c510

Browse files
committed
RC 0.0-45
1 parent 8a193bc commit aa0c510

23 files changed

+143
-279
lines changed

NAMESPACE

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
## get.sst
2+
33
importFrom(sp, "coordinates<-", "gridded<-", as.image.SpatialGridDataFrame)
44

55
## position.logp
@@ -47,8 +47,7 @@ export(elevation)
4747
export(EQUHOR)
4848
export(FRAC)
4949
export(get.mask)
50-
##export(get.pimgs)
51-
export(get.sst)
50+
5251
export(initialize.x)
5352
export(julcent)
5453
export(julday)

NEWS

+4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Changes to version 0.0-45
22

3+
o fixed some missing documentation
4+
5+
o really removed get.sst, that didn't work for a long time
6+
37
o remove rgdal, now import reproj
48

59
o fix citation, thanks to T. Michelot

R/bits.R

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
"bits" <-
22
function(object,bit) {
3-
(object %/% (2^bit)) %% 2
3+
out <- (object %/% (2^bit)) %% 2
4+
if (!is.null(dim(object))) dim(out) <- dim(object)
5+
out
46
}
57

68
"bits<-" <-

R/get.pimgs.R

-40
This file was deleted.

R/get.sst.R

-74
This file was deleted.

R/zzz.r

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
.onAttach <- function(libname, pkgname) {
2-
packageStartupMessage("tripEstimation has been superseded by SGAT, please look at using that package instead:\nhttps://github.com/SWotherspoon/SGAT")
2+
packageStartupMessage("tripEstimation has been superseded by SGAT and SGATII:\nhttps://github.com/SWotherspoon/SGAT, https://github.com/SWotherspoon/SGATII")
33
invisible()
4-
}
4+
}

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ tripEstimation
55

66
tripEstimation maintenance
77

8-
NOTE: this package is now deprecated by SGAT, https://github.com/SWotherspoon/SGAT
8+
NOTE: this package is now deprecated by SGAT, https://github.com/SWotherspoon/SGAT or https://github.com/SWotherspoon/SGATII.
99

1010

1111

cran-comments.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
## R CMD check results
2+
3+
tripEstimation 0.0-45 to remove dependency on rgdal.
4+
5+
This is an old package
6+
Thank you.
7+
8+
9+
0 errors | 0 warnings | 0 notes

inst/CITATION

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bibentry(
1313
publisher = "Public Library of Science",
1414
volume = "4",
1515
year = "2009",
16-
url = "http://dx.plos.org/10.1371/journal.pone.0007324")
16+
url = "https://journals.plos.org/plosone/article?id=10.1371/journal.pone.0007324")
1717

1818
year <- sub(".*(2[[:digit:]]{3})-.*", "\\1", meta$Date)
1919
vers <- paste("R package version", meta$Version)

man/as.image.pimg.Rd

+16-6
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@
33
\alias{as.matrix.pimg}
44
\alias{combine}
55
\alias{coords.pimg}
6-
\alias{get.pimgs}
76
\alias{unzipper}
87
\alias{as.local.pimg}
98
%- Also NEED an '\alias' for EACH other topic documented here.
109
\title{Convert to image list}
1110
\description{
1211
Converts Probability image (pimage) component to standard R xyz list
13-
image.
12+
image.
1413
}
1514
\usage{
1615
as.image.pimg(pimg)
1716
combine(pimgs, subset = 1:length(pimgs))
1817
coords.pimg(pimg)
19-
get.pimgs(rootdir = NULL, f2load = "p_ImageList.Rdata")
2018
unzipper(px)
2119
as.local.pimg(pimg)
2220
\method{as.matrix}{pimg}(x, \dots)
@@ -26,8 +24,6 @@ as.local.pimg(pimg)
2624
\item{pimg}{Probability image component}
2725
\item{pimgs}{ \code{pimgs} }
2826
\item{subset}{ \code{subset} }
29-
\item{rootdir}{ \code{rootdir} }
30-
\item{f2load}{ \code{f2load} }
3127

3228
\item{px}{ \code{px} }
3329

@@ -36,8 +32,22 @@ as.local.pimg(pimg)
3632
\item{\dots}{\code{\dots}}
3733
}
3834

35+
\value{
36+
\code{as.image.pimg} returns a \code{image} list with vectors x,y and z matrix
37+
38+
\code{as.matrix.pimg} returns just the local matrix populated in the parent
39+
40+
\code{combine} returns the collective matrix, in \code{image} xyz form
41+
42+
\code{coords.pimg} returns the rectilinear coordinates of the pimg parent
43+
44+
\code{unzipper} returns a \code{pimg.list} by combining multiple compatible ones together and resolving their temporal order
45+
46+
\code{as.local.pimg} returns the \code{pimg} in local form
47+
}
48+
3949
\author{Michael D. Sumner}
4050

4151
% Add one or more standard keywords, see file 'KEYWORDS' in the
4252
% R documentation directory.
43-
\keyword{manip}
53+
\keyword{manip}

man/astro.Rd

+15-15
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
\alias{POLAR}
1010
\title{Calculations for position of the sun and moon}
1111
\description{
12-
This set of functions provides simple position calculations for the sun and moon,
12+
This set of functions provides simple position calculations for the sun and moon,
1313
taken from Pascal routines published in Montenbruck and Pfleger (1994, Dunlop).
14-
14+
1515
These are completely independent from the (specifically optimized) solar elevation
16-
calculations available via [elevation and solar].
16+
calculations available via [elevation and solar].
1717
}
1818
\usage{
1919
astro(lon, lat, astro.calc)
@@ -38,35 +38,35 @@ POLAR(X, Y, Z)
3838
\item{lon}{vector of \code{lon}gitudes}
3939
\item{lat}{vector of \code{lat}itudes}
4040
\item{astro.calc}{list object containing \code{RA} right ascension }
41-
41+
4242
%% EQUHOR
4343
\item{DEC}{declination}
4444
\item{TAU}{\code{TAU} }
4545
\item{PHI}{ \code{PHI} }
46-
47-
%% FRAC
46+
47+
%% FRAC
4848
\item{x}{number}
49-
49+
5050
%% LMST
5151
\item{MJDay}{ modified julian day }
5252
\item{LAMBDA}{\code{LAMBDA} }
53-
53+
5454
%% lunar / mini.sun
5555
\item{time}{ vector of date-times in POSIXct format }
56-
57-
%% MJDay
56+
57+
%% MJDay
5858
\item{date}{ vector of date-times in POSIXct format }
59-
59+
6060
%% POLAR
6161
\item{X}{ x-coordinate}
6262
\item{Y}{ y-coordinate }
6363
\item{Z}{ z-coordinate }
64-
64+
6565
}
6666

6767
\value{
6868
\code{astro} returns a list object with the components of the moon or sun's
69-
position,
69+
position,
7070
\item{r }{rho component }
7171
\item{theta }{theta component - elevation}
7272
\item{phi}{phi component - azimuth}
@@ -110,9 +110,9 @@ op <- par(mfrow = c(2,1))
110110
plot(tm, rtp$theta, main = "solar elevation, Hobart")
111111
plot(tm, rtp$phi, main = "solar azimuth, Hobart")
112112
par(op)
113-
\dontrun{
113+
\donttest{
114114
elev.gmt <- mkElevationSeg(1, tm)
115-
plot(tm, rtp$theta, main = "solar elevation mini.sun versus NOAA")
115+
plot(tm, rtp$theta, main = "solar elevation mini.sun versus NOAA")
116116
lines(tm, elev.gmt(1, 147, -42))
117117
}
118118
}

man/behav.bin.Rd

+11-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
%- Also NEED an '\alias' for EACH other topic documented here.
66
\title{ Bin MCMC chains. }
77
\description{
8-
Bin MCMC chains in probability image summaries.
8+
Bin MCMC chains in probability image summaries.
99
}
1010
\usage{
1111
behav.bin(z, pimgs, weights = NULL)
@@ -24,11 +24,19 @@ chunk.bin(filename, pimgs, weights = NULL, chunk = 2000, proj = NULL)
2424

2525
\item{filename}{ \code{filename} }
2626

27-
27+
2828
\item{chunk}{ \code{chunk} }
2929
\item{proj}{ \code{proj} }
3030
}
31+
\value{
32+
33+
\code{behav.bin} returns a \code{pimg.list}
34+
35+
\code{bin.pimg} and \code{chunk.bin} provide work flow for \code{behav.bin}, to do the local binning and
36+
control the overal job
3137

38+
39+
}
3240
% Add one or more standard keywords, see file 'KEYWORDS' in the
3341
% R documentation directory.
34-
\keyword{manip}
42+
\keyword{manip}

man/bits.Rd

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
\alias{bits<-}
44
\title{ Set and get bits from binary masks. }
55
\description{
6-
Utility functions to access bits from numeric values,
7-
for the efficient storage of spatial masks.
6+
Utility functions to access bits from numeric values,
7+
for the efficient storage of spatial masks.
88
}
99
\usage{
1010
bits(object, bit)
@@ -16,29 +16,29 @@ bits(object, bit) <- value
1616
%% bits
1717
\item{object}{ a numeric value }
1818
\item{bit}{ the desired bit}
19-
19+
2020
%% bits<-
2121

2222
\item{value}{ logical value to set bit to }
2323
}
2424
\details{
25-
\R uses 32-bit integers, so we can (easily) access 31 binary matrices in each numeric
26-
matrix. This is very useful for storing long time-series of spatial masks,
27-
required for track-location estimation from archival tags.
28-
25+
\R uses 32-bit integers, so we can (easily) access 31 binary matrices in each numeric
26+
matrix. This is very useful for storing long time-series of spatial masks,
27+
required for track-location estimation from archival tags.
28+
2929
}
3030
\value{
3131
A numeric object with the given bit set, or a logical value designating the
32-
status of the given bit.
32+
status of the given bit.
3333
}
3434

3535
\author{ Michael D. Sumner }
36-
\note{ The 32nd bit is harder to access, so we ignore it.
36+
\note{ The 32nd bit is harder to access, so we ignore it.
3737
}
3838
\seealso{ See Also \code{\link{get.mask}} for a higher level access of a mask object }
3939
%and \{code\link{\%\%}} for integer division. }
4040
\examples{
41-
a <- 1
41+
a <- 1L
4242
bits(a, 0) ## 1
4343
bits(a, 2) <- 1
4444
a # 5

0 commit comments

Comments
 (0)