Skip to content

Commit

Permalink
- Added issues folder
Browse files Browse the repository at this point in the history
- Added John Reid as contributor
- Added fix in SREutils.R Sm@S0 <- Sm@S0[needed_BAUs,]
- Fixed NOAA dataset source and reference
- Added variable boundary buffer to convex hull construction
- Now referring all C files to LICENSE.note instead of README.txt
  • Loading branch information
andrewzm committed Mar 6, 2017
1 parent 5f7353f commit af48a2b
Show file tree
Hide file tree
Showing 26 changed files with 30 additions and 1,132 deletions.
4 changes: 2 additions & 2 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ bigstudies
^\.\.Rcheck$
^\.git$
^inla-mesher-functions
^issues
^PBSmapping
^R/rhipe_fns.R$
.log$
Expand All @@ -22,5 +23,4 @@ bigstudies
^vignettes/figures
rhipe_fns.R$
^Permissions
^pres
.Rnw$
^pres
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ src/*.so
FRK.Rcheck
*.tar.gz
inla-mesher-functions
issues
PBSmapping
paper
vignettes/cache
Expand Down
3 changes: 2 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ Authors@R: c(
person("Andrew", "Zammit-Mangion", , "[email protected]", c("aut", "cre")),
person("Timothy", "Davis", , "[email protected]", role = "ctb"),
person("Patrick","Amestoy", ,"[email protected]", role = "ctb"),
person("Iain","Duff", ,"[email protected]", role = "ctb"))
person("Iain","Duff", ,"[email protected]", role = "ctb"),
person("John K.","Reid", ,"[email protected]", role = "ctb"))
Maintainer: Andrew Zammit-Mangion <[email protected]>
VignetteBuilder: knitr
Description: Fixed Rank Kriging is a tool for spatial/spatio-temporal modelling
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.note
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ SuiteSparse_config.h is from SuiteSparse. The file contains the following licens



sparseinv* are taken from the sparseinv package in SuiteSparse. Since sparseinv is posted at MATLAB Central, it falls under the BSD liense. The BSD license is the following
sparseinv* are taken from the sparseinv package in SuiteSparse. Since sparseinv is posted at MATLAB Central, it falls under the BSD license. The BSD license is the following

Copyright (c) Copyright 2011, Timothy A. Davis, University of Florida
All rights reserved.
Expand Down
1 change: 1 addition & 0 deletions R/SREutils.R
Original file line number Diff line number Diff line change
Expand Up @@ -959,6 +959,7 @@ SRE.predict <- function(SRE_model,obs_fs=FALSE,pred_polys = NULL,pred_time = NUL
BAUs <- BAUs[needed_BAUs,]
CP <- CP[,needed_BAUs]
CZ <- CZ[,needed_BAUs]
Sm@S0 <- Sm@S0[needed_BAUs,]
}

# Deprecated:
Expand Down
4 changes: 2 additions & 2 deletions R/datadoc.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#' @title NOAA maximum temperature data for 1990-1993
#'
#' @description Maximum temperature data obtained from the National Oceanic and Atmospheric Administration (NOAA) for a part of the USA between 1990 and 1993 (inclusive).
#' @description Maximum temperature data obtained from the National Oceanic and Atmospheric Administration (NOAA) for a part of the USA between 1990 and 1993 (inclusive). See http://iridl.ldeo.columbia.edu/SOURCES/.NOAA/.NCDC/.DAILY/.FSOD/.
#'
#' @format A data frame with 196253 rows and 8 variables:
#' \describe{
Expand All @@ -32,7 +32,7 @@
#' \item{lat}{latitude coordinate of retrieval}
#' }
#' @docType data
#' @references Chahine, M. et al. (2006). AIRS: Improving weather forecasting and providing new data on greenhouse gases. Bulletin of the American Meteorological Society 87, 911--26.
#' @references National Climatic Data Center, March 1993: Local Climatological Data. Environmental Information summary (C-2), NOAA-NCDC, Asheville, NC.
"NOAA_df_1990"

#' @title ISEA Aperture 3 Hexagon (ISEA3H) Discrete Global Grid
Expand Down
4 changes: 2 additions & 2 deletions R/geometryfns.R
Original file line number Diff line number Diff line change
Expand Up @@ -1476,8 +1476,8 @@ as.SpatialPolygons.GridTopology2 <- function (grd, proj4string = CRS(as.characte
# expand convex hull out
bndary_seg <- conv_hull
delta <- max(apply(bound_box,1,function(x) diff(range(x))))
bndary_seg[,1] <- conv_hull[,1] + sign(conv_hull[,1] - centroid[1])*delta/5
bndary_seg[,2] <- conv_hull[,2] + sign(conv_hull[,2] - centroid[2])*delta/5
bndary_seg[,1] <- conv_hull[,1] + sign(conv_hull[,1] - centroid[1])*delta*(-convex)
bndary_seg[,2] <- conv_hull[,2] + sign(conv_hull[,2] - centroid[2])*delta*(-convex)
#bndary_seg[,1] <- centroid[1] + (conv_hull[,1] - centroid[1])*2
#bndary_seg[,2] <- centroid[2] + (conv_hull[,2] - centroid[2])*2
colnames(bndary_seg) <- NULL
Expand Down
4 changes: 2 additions & 2 deletions man/NOAA_df_1990.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions man/SRE.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/amd.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD Version 2.2, Copyright (c) 2007 by Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion src/amd_1.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion src/amd_2.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion src/amd_aat.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion src/amd_control.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion src/amd_defaults.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion src/amd_dump.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion src/amd_global.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion src/amd_info.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion src/amd_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion src/amd_order.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion src/amd_post_tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion src/amd_postorder.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion src/amd_preprocess.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
2 changes: 1 addition & 1 deletion src/amd_valid.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

/* ------------------------------------------------------------------------- */
/* AMD, Copyright (c) Timothy A. Davis, */
/* Patrick R. Amestoy, and Iain S. Duff. See ../README.txt for License. */
/* Patrick R. Amestoy, and Iain S. Duff. See ../LICENSE.note for License. */
/* email: [email protected] */
/* ------------------------------------------------------------------------- */

Expand Down
Binary file modified vignettes/FRK_intro.pdf
Binary file not shown.
Loading

0 comments on commit af48a2b

Please sign in to comment.