-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Metadata units handling feature merge-in
Merge branch 'master' of https://github.com/pik-piam/magclass into units # Conflicts: # DESCRIPTION # R/getMetadata.R # R/updateMetadata.R
- Loading branch information
Showing
11 changed files
with
163 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,41 @@ | ||
| #' @title magpply | ||
| #' @description apply command for magpieobjects. Very efficient for replacing loops. | ||
| #' | ||
| #' @param X magpie object | ||
| #' @param FUN function that shall be applied X | ||
| #' @param MARGIN dimension over which FUN shall be applied (like a loop over that dimension). This dimension will be preserved in the output object | ||
| #' @param ... further parameters passed on to FUN | ||
| #' @param integrate if TRUE, the output will be filled into an magpie object of the same dimensionality as X | ||
| #' | ||
| #' @return magpie object | ||
| #' @author Benjamin Leon Bodirsky | ||
| #' @examples | ||
| #' | ||
| #' \dontrun{ | ||
| #' data("population_magpie") | ||
| #' magpply(population_magpie,FUN=sum,MARGIN=2) | ||
| #' fourdim<-population_magpie*setNames(population_magpie,c("jkk","lk")) | ||
| #' magpply(fourdim,FUN=sum,MARGIN=c(1,3.1)) | ||
| #' magpply(fourdim,FUN=function(x){return(x+1)},MARGIN=c(1,3.1),integrate=TRUE) | ||
| #' } | ||
| #' | ||
|
|
||
| magpply<-function(X,FUN,MARGIN,...,integrate=FALSE){ | ||
| if(any(MARGIN>3)){ | ||
| for(counter in which(MARGIN>3)){ | ||
| MARGIN[counter]=old_dim_convention(MARGIN[counter]) | ||
| } | ||
| X<-unwrap(X) | ||
| } | ||
| out<-apply(X = X,FUN = FUN,MARGIN=MARGIN) | ||
| if(integrate==TRUE){ | ||
| X[,,]<-out | ||
| out<-X | ||
| } else { | ||
| out<-as.magpie(out) | ||
| } | ||
| out <- updateMetadata(out,X,unit="copy",source="copy",calcHistory="copy",description="copy") | ||
| return(out) | ||
| #' @title magpply | ||
| #' @description apply command for magpieobjects. Very efficient for replacing loops. | ||
| #' | ||
| #' @param X magpie object | ||
| #' @param FUN function that shall be applied X | ||
| #' @param MARGIN dimension over which FUN shall be applied (like a loop over that dimension). This dimension will be preserved in the output object | ||
| #' @param ... further parameters passed on to FUN | ||
| #' @param integrate if TRUE, the output will be filled into an magpie object of the same dimensionality as X | ||
| #' | ||
| #' @return magpie object | ||
| #' @author Benjamin Leon Bodirsky | ||
| #' @examples | ||
| #' | ||
| #' \dontrun{ | ||
| #' data("population_magpie") | ||
| #' magpply(population_magpie,FUN=sum,MARGIN=2) | ||
| #' fourdim<-population_magpie*setNames(population_magpie,c("jkk","lk")) | ||
| #' magpply(fourdim,FUN=sum,MARGIN=c(1,3.1)) | ||
| #' magpply(fourdim,FUN=function(x){return(x+1)},MARGIN=c(1,3.1),integrate=TRUE) | ||
| #' } | ||
| #' | ||
| #' @export magpply | ||
|
|
||
| magpply<-function(X,FUN,MARGIN,...,integrate=FALSE){ | ||
| if(any(MARGIN>3)){ | ||
| for(counter in which(MARGIN>3)){ | ||
| MARGIN[counter]=old_dim_convention(MARGIN[counter]) | ||
| } | ||
| X<-unwrap(X) | ||
| } | ||
|
|
||
| out<-apply(X = X,FUN = FUN,MARGIN=MARGIN) | ||
| if(integrate==TRUE){ | ||
| X[,,]<-out | ||
| out<-X | ||
| } else { | ||
| out<-as.magpie(out) | ||
| } | ||
| out <- updateMetadata(out,X,unit="copy",source="copy",calcHistory="copy",description="copy") | ||
| return(out) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.