diff --git a/R/admix1.R b/R/admix1.R index c50d4fe..e678b49 100644 --- a/R/admix1.R +++ b/R/admix1.R @@ -350,54 +350,4 @@ admix1 <- function(tietue) { # save([pathname filename], 'tietue', '-v7.3'); # added by Lu Cheng, 08.06.2012 # end # end -} - - -# function [npops] = poistaLiianPienet(npops, rowsFromInd, alaraja) -# % Muokkaa tulokset muotoon, jossa outlier yksilöt on -# % poistettu. Tarkalleen ottaen poistaa ne populaatiot, -# % joissa on vähemmän kuin 'alaraja':n verran yksilöit? - -# global PARTITION; -# global COUNTS; -# global SUMCOUNTS; - -# popSize=zeros(1,npops); -# for i=1:npops -# popSize(i)=length(find(PARTITION==i)); -# end -# miniPops = find(popSize0))); -# for n=1:length(korit) -# kori = korit(n); -# yksilot = find(PARTITION==kori); -# PARTITION(yksilot) = n; -# end -# COUNTS(:,:,miniPops) = []; -# SUMCOUNTS(miniPops,:) = []; - -# npops = npops-length(miniPops); - -# %------------------------------------------------------------------------ - -# function clearGlobalVars - -# global COUNTS; COUNTS = []; -# global SUMCOUNTS; SUMCOUNTS = []; -# global PARTITION; PARTITION = []; -# global POP_LOGML; POP_LOGML = []; \ No newline at end of file +} \ No newline at end of file diff --git a/man/computeAllFreqs2.Rd b/man/computeAllFreqs2.Rd index 7bb8b04..bf969cf 100644 --- a/man/computeAllFreqs2.Rd +++ b/man/computeAllFreqs2.Rd @@ -4,7 +4,7 @@ \alias{computeAllFreqs2} \title{Compute all freqs - version 2} \usage{ -computeAllFreqs2(noalle, COUNTS = matrix(NA, 0, 0), SUMCOUNTS = sum(COUNTS)) +computeAllFreqs2(noalle, COUNTS = matrix(NA, 0, 0), SUMCOUNTS = NA) } \arguments{ \item{noalle}{noalle} diff --git a/man/repmat.Rd b/man/repmat.Rd index 3ec7750..0fbaa6e 100644 --- a/man/repmat.Rd +++ b/man/repmat.Rd @@ -9,7 +9,8 @@ repmat(mx, n) \arguments{ \item{mx}{matrix} -\item{n}{either a scalar with the number of replications in both rows and columns or a 2-length vector with individual repetitions.} +\item{n}{either a scalar with the number of replications in both rows and +columns or a <= 3-length vector with individual repetitions.} } \value{ matrix replicated over `ncol(mx) * n` columns and `nrow(mx) * n` rows