Skip to content

Commit

Permalink
Merge branch 'new_utils'
Browse files Browse the repository at this point in the history
  • Loading branch information
NiklasHohmann committed Dec 5, 2023
2 parents fbe3eaf + 03406e1 commit 9dfffbb
Show file tree
Hide file tree
Showing 5 changed files with 93 additions and 0 deletions.
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ export(get_total_thickness)
export(is_adm)
export(is_destructive)
export(merge_adm_to_multiadm)
export(merge_multiadm)
export(sedrate_to_multiadm)
export(split_multiadm)
export(strat_cont_to_multiadm)
Expand Down
28 changes: 28 additions & 0 deletions R/add_adm_to_multiadm.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
add_adm_to_multiadm = function(x, ...){

#'
#' @export
#'
#' @title add adm object ot multiadm object
#'
#' @param x multiadm object
#' @param ... adm objects to be added to x
#'
#' @returns a multiadm object
#'

inlist = list(...)


for (i in seq_along(inlist)){
x[["t"]][[x$no_of_entries + i]] = inlist[[i]]$t
x[["h"]][[x$no_of_entries + i]] = inlist[[i]]$h
x[["destr"]][[x$no_of_entries + i]] = inlist[[i]]$destr
x[["T_unit"]][[x$no_of_entries + i]] = inlist[[i]]$T_unit
x[["L_unit"]][[x$no_of_entries + i]] = inlist[[i]]$L_unit

}
x$no_of_entries = x$no_of_entries + length(inlist)

return(x)
}
28 changes: 28 additions & 0 deletions R/merge_multiadm.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
merge_multiadm = function(...){

#'
#' @export
#'
#' @title merge multiple multiadm objects
#'
#' @param ... adm objects
#'
#' @returns multiadm object
#'
inlist = list(...)

x = inlist[[1]]

if (length(inlist) > 1){
for (i in 2:length(inlist)){
next_multiadm = inlist[[i]]
# split multiadm into adms
split_multiadm_list = split_multiadm(next_multiadm)
for (j in length(split_multiadm_list)){
x = add_adm_to_multiadm(x, split_multiadm_list[[j]])
}

}
}
return(x)
}
19 changes: 19 additions & 0 deletions man/add_adm_to_multiadm.Rd

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

17 changes: 17 additions & 0 deletions man/merge_multiadm.Rd

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

0 comments on commit 9dfffbb

Please sign in to comment.