Skip to content

Commit

Permalink
Merge branch 'devel' of github.com:bioconductor-source/Pedixplorer
Browse files Browse the repository at this point in the history
  • Loading branch information
Louis Le Nezet committed Oct 10, 2024
2 parents 44a1dc6 + 569e94f commit 87a4644
Show file tree
Hide file tree
Showing 190 changed files with 12,588 additions and 6,458 deletions.
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
*.Rproj
*.so
*.Rprofile
devel/*
Pedixplorer.Rcheck
*.lintr
Pedixplorer*
devel
50 changes: 50 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "R-Debugger",
"name": "Launch R-Workspace",
"request": "launch",
"debugMode": "workspace",
"workingDirectory": "${workspaceFolder}"
},
{
"type": "R-Debugger",
"name": "Debug R-File",
"request": "launch",
"debugMode": "file",
"workingDirectory": "${workspaceFolder}",
"file": "${file}"
},
{
"type": "R-Debugger",
"name": "Debug R-Function",
"request": "launch",
"debugMode": "function",
"workingDirectory": "${workspaceFolder}",
"file": "${file}",
"mainFunction": "main",
"allowGlobalDebugging": false
},
{
"type": "R-Debugger",
"name": "Debug R-Package",
"request": "launch",
"debugMode": "workspace",
"workingDirectory": "${workspaceFolder}",
"includePackageScopes": true,
"loadPackages": [
"."
]
},
{
"type": "R-Debugger",
"request": "attach",
"name": "Attach to R process",
"splitOverwrittenOutput": true
}
]
}
37 changes: 20 additions & 17 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: Pedixplorer
Version: 0.99.2
Date: 2023-09-19
Version: 1.1.0
Date: 2023-11-15
Title: Pedigree Functions
Authors@R: c(
person("Louis", "Le Nézet", email="[email protected]",
Expand All @@ -24,7 +24,9 @@ Imports:
dplyr,
tidyr,
quadprog,
Matrix
Matrix,
S4Vectors,
testthat
Description: Routines to handle family data with a Pedigree object. The initial purpose
was to create correlation structures that describe family relationships such
as kinship and identity-by-descent, which can be used to model family data
Expand All @@ -38,39 +40,39 @@ RoxygenNote: 7.2.3
Roxygen: list(markdown = TRUE)
VignetteBuilder: knitr
Suggests:
testthat (>= 3.0.0),
diffviewer,
vdiffr,
rmarkdown,
vdiffr,
rmarkdown,
BiocStyle,
knitr,
withr
withr,
magick
Config/testthat/edition: 3
biocViews: Software, DataRepresentation, Genetics, Alignment
BugReports: https://github.com/LouisLeLezet/Pedixplorer/issues
url: https://github.com/LouisLeNezet/Pedixplorer
URL: https://github.com/LouisLeNezet/Pedixplorer
BiocType: Software
Collate:
'Pedigree.R'
'AllValidity.R'
'AllClass.R'
'kindepth.R'
'kinship.R'
'utils.R'
'AllConstructor.R'
'AllAccessors.R'
'AllGeneric.R'
'Pedixplorer-package.R'
'alignped4.R'
'alignped3.R'
'alignped2.R'
'alignped1.R'
'validity.R'
'pedigreeClass.R'
'check_hints.R'
'kindepth.R'
'auto_hint.R'
'align.R'
'best_hint.R'
'bit_size.R'
'data.R'
'descendants.R'
'make_famid.R'
'family_check.R'
'kinship.R'
'utils.R'
'find_unavailable.R'
'find_avail_affected.R'
'find_avail_noninform.R'
Expand All @@ -79,6 +81,7 @@ Collate:
'generate_colors.R'
'ibd_matrix.R'
'is_informative.R'
'make_famid.R'
'min_dist_inf.R'
'norm_data.R'
'num_child.R'
Expand All @@ -88,6 +91,6 @@ Collate:
'plot_fromdf.R'
'plot.R'
'shrink.R'
'trim.R'
'unrelated.R'
'useful_inds.R'
LazyData: false
143 changes: 133 additions & 10 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,17 +1,45 @@
# Generated by roxygen2: do not edit by hand

export("affected<-")
export("avail<-")
export("border<-")
export("dadid<-")
export("famid<-")
export("fill<-")
export("hints<-")
export("horder<-")
export("id<-")
export("isinf<-")
export("kin<-")
export("momid<-")
export("ped<-")
export("rel<-")
export("scales<-")
export("sex<-")
export("spouse<-")
export("status<-")
export("useful<-")
export(Hints)
export(Ped)
export(Pedigree)
export(Rel)
export(Scales)
export(affected)
export(align)
export(alignped1)
export(alignped2)
export(alignped3)
export(alignped4)
export(ancestors)
export(anchor_to_factor)
export(auto_hint)
export(avail)
export(best_hint)
export(bit_size)
export(check_hints)
export(border)
export(circfun)
export(code)
export(dadid)
export(descendants)
export(famid)
export(family_check)
export(fill)
export(find_avail_affected)
export(find_avail_noninform)
export(find_unavailable)
Expand All @@ -21,47 +49,138 @@ export(generate_border)
export(generate_colors)
export(generate_fill)
export(hints)
export(horder)
export(ibd_matrix)
export(id)
export(id1)
export(id2)
export(is_disconnected)
export(is_founder)
export(is_informative)
export(is_valid_scales)
export(isinf)
export(kin)
export(kindepth)
export(kinship)
export(make_famid)
export(min_dist_inf)
export(momid)
export(na_to_length)
export(norm_ped)
export(norm_rel)
export(num_child)
export(ped)
export(ped_to_legdf)
export(ped_to_plotdf)
export(plot_fromdf)
export(polyfun)
export(polygons)
export(rel)
export(rel_code_to_factor)
export(scales)
export(sex)
export(sex_to_factor)
export(shrink)
export(trim)
export(spouse)
export(status)
export(unrelated)
export(upd_famid_id)
export(useful)
export(useful_inds)
export(vect_to_binary)
exportClasses(Hints)
exportClasses(Ped)
exportClasses(Pedigree)
exportClasses(Rel)
exportClasses(Scales)
exportMethods("[")
exportMethods("affected<-")
exportMethods("avail<-")
exportMethods("border<-")
exportMethods("dadid<-")
exportMethods("famid<-")
exportMethods("fill<-")
exportMethods("hints<-")
exportMethods("horder<-")
exportMethods("id<-")
exportMethods("isinf<-")
exportMethods("kin<-")
exportMethods("mcols<-")
exportMethods("momid<-")
exportMethods("ped<-")
exportMethods("rel<-")
exportMethods("scales<-")
exportMethods("sex<-")
exportMethods("spouse<-")
exportMethods("status<-")
exportMethods("useful<-")
exportMethods(Hints)
exportMethods(Ped)
exportMethods(Pedigree)
exportMethods(Rel)
exportMethods(Scales)
exportMethods(affected)
exportMethods(as.data.frame)
exportMethods(as.list)
exportMethods(auto_hint)
exportMethods(avail)
exportMethods(border)
exportMethods(code)
exportMethods(dadid)
exportMethods(famid)
exportMethods(family_check)
exportMethods(fill)
exportMethods(find_avail_affected)
exportMethods(find_avail_noninform)
exportMethods(find_unavailable)
exportMethods(fix_parents)
exportMethods(generate_colors)
exportMethods(hints)
exportMethods(horder)
exportMethods(id)
exportMethods(id1)
exportMethods(id2)
exportMethods(is_informative)
exportMethods(kindepth)
exportMethods(is_parent)
exportMethods(isinf)
exportMethods(kin)
exportMethods(kinship)
exportMethods(length)
exportMethods(make_famid)
exportMethods(mcols)
exportMethods(min_dist_inf)
exportMethods(momid)
exportMethods(num_child)
exportMethods(ped)
exportMethods(ped_to_legdf)
exportMethods(ped_to_plotdf)
exportMethods(plot)
exportMethods(rel)
exportMethods(scales)
exportMethods(sex)
exportMethods(show)
exportMethods(shrink)
exportMethods(spouse)
exportMethods(status)
exportMethods(subset)
exportMethods(summary)
exportMethods(unrelated)
exportMethods(upd_famid_id)
exportMethods(useful)
exportMethods(useful_inds)
importFrom(Matrix,bdiag)
importFrom(Matrix,forceSymmetric)
importFrom(Matrix,sparseMatrix)
importFrom(S4Vectors,'mcols')
importFrom(S4Vectors,'mcols<-')
importFrom(S4Vectors,as.data.frame)
importFrom(S4Vectors,as.list)
importFrom(S4Vectors,cbind_mcols_for_display)
importFrom(S4Vectors,classNameForDisplay)
importFrom(S4Vectors,makeClassinfoRowForCompactPrinting)
importFrom(S4Vectors,mcols)
importFrom(S4Vectors,parallel_slot_names)
importFrom(S4Vectors,subset)
importFrom(S4Vectors,summary)
importFrom(dplyr,"%>%")
importFrom(dplyr,across)
importFrom(dplyr,group_by)
Expand Down Expand Up @@ -98,10 +217,13 @@ importFrom(graphics,segments)
importFrom(graphics,strheight)
importFrom(graphics,strwidth)
importFrom(graphics,text)
importFrom(methods,"slot<-")
importFrom(methods,'slot<-')
importFrom(methods,as)
importFrom(methods,callNextMethod)
importFrom(methods,is)
importFrom(methods,new)
importFrom(methods,slot)
importFrom(methods,show)
importFrom(methods,slotNames)
importFrom(methods,validObject)
importFrom(plyr,rbind.fill)
importFrom(plyr,revalue)
Expand All @@ -116,3 +238,4 @@ importFrom(tidyr,pivot_longer)
importFrom(tidyr,unite)
importFrom(utils,setTxtProgressBar)
importFrom(utils,txtProgressBar)
importFrom(testthat, test_that)
Loading

0 comments on commit 87a4644

Please sign in to comment.