max/ourMELONS
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Improved argument retrieval on greedyMix() (#25)

Browse source
This commit is contained in:
Waldir Leoncio 2023-08-09 13:13:50 +02:00
parent bfeb2796c2
commit 15da6cdced
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
R/greedyMix.R
View file

@ -13,7 +13,7 @@
#' data <- system.file("extdata", "FASTA_clustering_haploid.fasta", package = "rBAPS") #' data <- system.file("extdata", "FASTA_clustering_haploid.fasta", package = "rBAPS")
#' greedyMix(data, "fasta") #' greedyMix(data, "fasta")
greedyMix <- function( greedyMix <- function(
data, format, c.rows, partitionCompare.partitions, ninds, rowsFromInd, noalle, data, format, partitionCompare, ninds, rowsFromInd, noalle,
adjprior, priorTerm, alleleCodesinp, popnames, fixedK = FALSE, adjprior, priorTerm, alleleCodesinp, popnames, fixedK = FALSE,
partition_compare = FALSE, verbose = TRUE partition_compare = FALSE, verbose = TRUE
) { ) {
@ -22,10 +22,12 @@ greedyMix <- function(
if (partition_compare) { if (partition_compare) {
logmls <- comparePartitions( logmls <- comparePartitions(
data, c.rows, partitionCompare.partitions, ninds, rowsFromInd, noalle, data, nrows(data), partitionCompare[["partitions"]], ninds, rowsFromInd,
adjprior noalle, adjprior
) )
} }
# Generating partition summary =============================================== # Generating partition summary ===============================================
logml_npops_partitionSummary <- indMixWrapper(data, npops, fixedK); logml_npops_partitionSummary <- indMixWrapper(data, npops, fixedK);
logml <- logml_npops_partitionSummary[["logml"]] logml <- logml_npops_partitionSummary[["logml"]]

3
man/greedyMix.Rd
View file

@ -7,8 +7,7 @@
greedyMix( greedyMix(
data, data,
format, format,
c.rows, partitionCompare,
partitionCompare.partitions,
ninds, ninds,
rowsFromInd, rowsFromInd,
noalle, noalle,