@@ -20,42 +20,42 @@ update.expectation.dmat <- function(PARAM, update.logL = TRUE){
20
20
K <- PARAM $ K
21
21
22
22
# ## WCC: original
23
- .pmclustEnv $ U.dmat <- sweep(.pmclustEnv $ W.dmat , 2 , PARAM $ log.ETA , FUN = " +" )
23
+ # .pmclustEnv$U.dmat <- sweep(.pmclustEnv$W.dmat, 2, PARAM$log.ETA, FUN = "+")
24
24
# ## WCC: temp dmat
25
25
# tmp.1 <- sweep(.pmclustEnv$W.dmat, 2, PARAM$log.ETA, FUN = "+")
26
26
# .pmclustEnv$U.dmat <- tmp.1
27
27
# ## WCC: temp spmd
28
- # tmp.1 <- as.matrix(.pmclustEnv$W.dmat)
29
- # tmp.2 <- sweep(tmp.1, 2, PARAM$log.ETA, FUN = "+")
30
- # .pmclustEnv$U.dmat <- as.ddmatrix(tmp.2)
28
+ tmp.1 <- as.matrix(.pmclustEnv $ W.dmat )
29
+ tmp.2 <- sweep(tmp.1 , 2 , PARAM $ log.ETA , FUN = " +" )
30
+ .pmclustEnv $ U.dmat <- as.ddmatrix(tmp.2 )
31
31
32
32
# ## WCC: original
33
- .pmclustEnv $ Z.dmat <- exp(.pmclustEnv $ U.dmat )
33
+ # .pmclustEnv$Z.dmat <- exp(.pmclustEnv$U.dmat)
34
34
# ## WCC: temp dmat
35
35
# tmp.1 <- exp(.pmclustEnv$U.dmat)
36
36
# .pmclustEnv$Z.dmat <- tmp.1
37
37
# ## WCC: temp spmd
38
- # tmp.1 <- as.matrix(.pmclustEnv$U.dmat)
39
- # tmp.2 <- exp(tmp.1)
40
- # .pmclustEnv$Z.dmat <- as.ddmatrix(tmp.2)
38
+ tmp.1 <- as.matrix(.pmclustEnv $ U.dmat )
39
+ tmp.2 <- exp(tmp.1 )
40
+ .pmclustEnv $ Z.dmat <- as.ddmatrix(tmp.2 )
41
41
42
42
# ## WCC: original
43
- tmp.id <- rowSums(.pmclustEnv $ U.dmat < .pmclustEnv $ CONTROL $ exp.min ) == K |
44
- rowSums(.pmclustEnv $ U.dmat > .pmclustEnv $ CONTROL $ exp.max ) > 0
45
- tmp.id <- as.logical(as.vector(tmp.id ))
43
+ # tmp.id <- rowSums(.pmclustEnv$U.dmat < .pmclustEnv$CONTROL$exp.min) == K |
44
+ # rowSums(.pmclustEnv$U.dmat > .pmclustEnv$CONTROL$exp.max) > 0
45
+ # tmp.id <- as.logical(as.vector(tmp.id))
46
46
# ## WCC: temp dmat
47
- # tmp.1 <- .pmclustEnv$U.dmat < .pmclustEnv$CONTROL$exp.min
48
- # tmp.1 <- as.matrix(tmp.1)
49
- # tmp.2 <- rowSums(tmp.1)
50
- # tmp.3 <- tmp.2 == K
51
- # tmp.4 <- .pmclustEnv$U.dmat > .pmclustEnv$CONTROL$exp.max
52
- # tmp.4 <- as.matrix(tmp.4)
53
- # tmp.5 <- rowSums(tmp.4)
54
- # tmp.6 <- tmp.5 > 0
55
- # tmp.7 <- tmp.3 | tmp.6
56
- # tmp.8 <- as.vector(tmp.7)
57
- # tmp.id <- tmp.8
58
- # tmp.id <- as.logical(tmp.id)
47
+ tmp.1 <- .pmclustEnv $ U.dmat < .pmclustEnv $ CONTROL $ exp.min
48
+ tmp.1 <- as.matrix(tmp.1 )
49
+ tmp.2 <- rowSums(tmp.1 )
50
+ tmp.3 <- tmp.2 == K
51
+ tmp.4 <- .pmclustEnv $ U.dmat > .pmclustEnv $ CONTROL $ exp.max
52
+ tmp.4 <- as.matrix(tmp.4 )
53
+ tmp.5 <- rowSums(tmp.4 )
54
+ tmp.6 <- tmp.5 > 0
55
+ tmp.7 <- tmp.3 | tmp.6
56
+ tmp.8 <- as.vector(tmp.7 )
57
+ tmp.id <- tmp.8
58
+ tmp.id <- as.logical(tmp.id )
59
59
60
60
tmp.flag <- sum(tmp.id )
61
61
if (tmp.flag > 0 ){
0 commit comments