Translated laskeOsaDist
This commit is contained in:
parent
1dabea0c4c
commit
ec03a04507
2 changed files with 19 additions and 20 deletions
20
R/indMix.R
20
R/indMix.R
|
|
@ -610,26 +610,6 @@ indMix <- function(c, npops, dispText) {
|
|||
# end
|
||||
# end
|
||||
|
||||
# %----------------------------------------------------------------------------
|
||||
|
||||
|
||||
# function dist2 = laskeOsaDist(inds2, dist, ninds)
|
||||
# % Muodostaa dist vektorista osavektorin, joka sis<69>lt<6C><74> yksil<69>iden inds2
|
||||
# % v<>liset et<65>isyydet. ninds=kaikkien yksil<69>iden lukum<75><6D>r<EFBFBD>.
|
||||
|
||||
# ninds2 = length(inds2);
|
||||
# apu = zeros(nchoosek(ninds2,2),2);
|
||||
# rivi = 1;
|
||||
# for i=1:ninds2-1
|
||||
# for j=i+1:ninds2
|
||||
# apu(rivi, 1) = inds2(i);
|
||||
# apu(rivi, 2) = inds2(j);
|
||||
# rivi = rivi+1;
|
||||
# end
|
||||
# end
|
||||
# apu = (apu(:,1)-1).*ninds - apu(:,1) ./ 2 .* (apu(:,1)-1) + (apu(:,2)-apu(:,1));
|
||||
# dist2 = dist(apu);
|
||||
|
||||
# %---------------------------------------------------------
|
||||
|
||||
# function T = cluster_own(Z,nclust)
|
||||
|
|
|
|||
19
R/laskeOsaDist.R
Normal file
19
R/laskeOsaDist.R
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
laskeOsaDist <- function(inds2, dist, ninds) {
|
||||
# % Muodostaa dist vektorista osavektorin, joka sis<69>lt<6C><74> yksil<69>iden inds2
|
||||
# % v<>liset et<65>isyydet. ninds=kaikkien yksil<69>iden lukum<75><6D>r<EFBFBD>.
|
||||
|
||||
ninds2 <- length(inds2)
|
||||
apu <- zeros(nchoosek(ninds2, 2), 2)
|
||||
rivi <- 1
|
||||
for (i in 1:ninds2-1) {
|
||||
for (j in i+1:ninds2) {
|
||||
apu[rivi, 1] <- inds2[i]
|
||||
apu[rivi, 2] <- inds2[j]
|
||||
rivi <- rivi + 1
|
||||
}
|
||||
}
|
||||
apu <- (apu[, 1]-1) * ninds - apu[, 1] / 2 *
|
||||
(apu[, 1]-1) + (apu[, 2] - apu[, 1])
|
||||
dist2 <- dist(apu)
|
||||
return(dist2)
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue