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

Fixed syntax

Browse source
This commit is contained in:
Waldir Leoncio 2021-05-20 09:18:05 +02:00
parent 8eb81c51d2
commit 4520fd30fb
3 changed files with 13 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
R/cluster_own.R
View file

@ -13,7 +13,7 @@ cluster_own <- function(Z, nclust) {
} else { } else {
clsnum <- 1 clsnum <- 1
for (k in (m - maxclust + 1):(m - 1)) { for (k in (m - maxclust + 1):(m - 1)) {
i = Z(k, 1) # left tree i = Z[k, 1] # left tree
if (i <= m) { # original node, no leafs if (i <= m) { # original node, no leafs
T[i] = clsnum T[i] = clsnum
clsnum = clsnum + 1 clsnum = clsnum + 1
@ -21,7 +21,7 @@ cluster_own <- function(Z, nclust) {
T <- clusternum(Z, T, i - m, clsnum) T <- clusternum(Z, T, i - m, clsnum)
clsnum <- clsnum + 1 clsnum <- clsnum + 1
} }
i <- Z(k, 2) # right tree i <- Z[k, 2] # right tree
if (i <= m) { # original node, no leafs if (i <= m) { # original node, no leafs
T[i] <- clsnum T[i] <- clsnum
clsnum <- clsnum + 1 clsnum <- clsnum + 1

16
R/clusternum.R
View file

@ -1,16 +1,14 @@
clusternum <- function(X, T, k, c) { clusternum <- function(X, T, k, c) {
m <- size(X, 1) + 1 m <- size(X, 1) + 1
while (!is.null(k)) { while (!isempty(k)) {
# % Get the children of nodes at this level # Get the children of nodes at this level
children <- X[k, 1:2] children <- X[k, 1:2]
children <- children[, ]
# % Assign this node number to leaf children # Assign this node number to leaf children
t <- (children <= m) t <- (children <= m)
T[children(t)] <- c T[children[t]] <- c
# Move to next level
# % Move to next level k <- children[!t] - m
k <- children(!t) - m
} }
return(T) return(T)
} }

8
R/greedyMix.R
View file

@ -77,10 +77,10 @@ greedyMix <- function(
# h0 = findobj('Tag','filename1_text'); # h0 = findobj('Tag','filename1_text');
# set(h0,'String',filename); clear h0; # set(h0,'String',filename); clear h0;
message( message(
'When using data which are in BAPS-format,', 'When using data which are in BAPS-format, ',
'you can specify the sampling populations of the', 'you can specify the sampling populations of the ',
'individuals by giving two additional files:', 'individuals by giving two additional files: ',
'one containing the names of the populations,', 'one containing the names of the populations, ',
'the other containing the indices of the first ', 'the other containing the indices of the first ',
'individuals of the populations.' 'individuals of the populations.'
) )