Skip to content

Commit

Permalink
Minor changes 0.1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewzm committed Jan 7, 2018
1 parent 8808217 commit f09da0c
Show file tree
Hide file tree
Showing 80 changed files with 10 additions and 9,134 deletions.
7 changes: 5 additions & 2 deletions R/geometryfns.R
Original file line number Diff line number Diff line change
Expand Up @@ -1165,6 +1165,7 @@ setMethod("map_data_to_BAUs",signature(data_sp="SpatialPolygons"),

## Attach the ID of the data polygon to the data frame
data_sp$id <- row.names(data_sp)
data_sp$id <- as.character(data_sp$id)

## Assume the BAUs are so small that it is sufficient to see whether the
## BAU centroid falls in the data polygon. To do this we first make
Expand All @@ -1181,10 +1182,12 @@ setMethod("map_data_to_BAUs",signature(data_sp="SpatialPolygons"),
BAUs_aux_data <- .parallel_over(data_sp,BAU_as_points,fn=.safe_mean)

## Now include the ID in the table so we merge by it later
BAUs_aux_data$id <- row.names(BAUs_aux_data)
BAUs_aux_data$id <- as.character(row.names(BAUs_aux_data))

## Do the merging
updated_df <- left_join(data_sp@data,BAUs_aux_data,by="id")
updated_df <- left_join(data_sp@data,
BAUs_aux_data,
by="id")

## Make sure the rownames are OK
row.names(updated_df) <- data_sp$id
Expand Down
5 changes: 5 additions & 0 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## v0.1.7
+ Made compatible with new update of Hmisc
+ Added support for change of support spatio-temporal prediction
+ Changed from pred_locs to newdata in arguments to SRE.predict

## v0.1.6
* Added scale_aperture to have control on aperture of basis functions
* Adde remove_basis to easily remove basis functions
Expand Down
Binary file removed src-i386/FRK.so
Binary file not shown.
19 changes: 0 additions & 19 deletions src-i386/RcppExports.cpp

This file was deleted.

Binary file removed src-i386/RcppExports.o
Binary file not shown.
202 changes: 0 additions & 202 deletions src-i386/SuiteSparse_config.h

This file was deleted.

Loading

0 comments on commit f09da0c

Please sign in to comment.