diff --git a/NAMESPACE b/NAMESPACE index aa5e19f..f304d20 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -8,6 +8,7 @@ export(computeIndLogml) export(computePersonalAllFreqs) export(computeRows) export(etsiParas) +export(isfield) export(laskeMuutokset4) export(learn_simple_partition) export(ownNum2Str) @@ -20,6 +21,7 @@ export(simulateAllFreqs) export(simulateIndividuals) export(simuloiAlleeli) export(size) +export(strcmp) export(suoritaMuutos) export(times) importFrom(stats,runif) diff --git a/R/poistaLiianPienet.R b/R/poistaLiianPienet.R index bc7f608..4ff581d 100644 --- a/R/poistaLiianPienet.R +++ b/R/poistaLiianPienet.R @@ -10,9 +10,8 @@ #' @param SUMCOUNTS SUMCOUNTS #' @export poistaLiianPienet <- function (npops, rowsFromInd, alaraja, - PARTITION = matrix(NA, 0, 0), COUNTS = matrix(NA, 0, 0), - SUMCOUNTS = NA) { - + PARTITION = matrix(NA, 0, 0), COUNTS = matrix(NA, 0, 0), + SUMCOUNTS = NA) { popSize <- zeros(1,npops) if (npops > 0) { for (i in 1:npops) { diff --git a/man/admix1.Rd b/man/admix1.Rd index 4f8c35a..d792b04 100644 --- a/man/admix1.Rd +++ b/man/admix1.Rd @@ -4,14 +4,22 @@ \alias{admix1} \title{Admixture analysis} \usage{ -admix1(tietue) +admix1( + tietue, + PARTITION = matrix(NA, 0, 0), + COUNTS = matrix(NA, 0, 0), + SUMCOUNTS = NA +) } \arguments{ -\item{tietue}{record} +\item{tietue}{a named record list} } \description{ Admixture analysis } \details{ -If the record == -1, the mixture results file is loaded. Otherwise, will the required variables be retrieved from the record fields? +If the record == -1, the mixture results file is loaded. Otherwise, +will the required variables be retrieved from the record fields? +`tietue`should contain the following elements: PARTITION, COUNTS, SUMCOUNTS, +alleleCodes, adjprior, popnames, rowsFromInd, data, npops, noalle }