Removed translating TODOs
Replaced with built-in TODO list in Issue #3's body
This commit is contained in:
parent
bc5bb61f52
commit
73438af7bb
2 changed files with 6 additions and 6 deletions
|
|
@ -3,10 +3,10 @@ findCliques <- function(M) {
|
||||||
# separaattorit.
|
# separaattorit.
|
||||||
# Hyצdynnetההn Kevin Murphyn algoritmeja Graph Theory toolboxista.
|
# Hyצdynnetההn Kevin Murphyn algoritmeja Graph Theory toolboxista.
|
||||||
# Pהivitetty 12.8.2005
|
# Pהivitetty 12.8.2005
|
||||||
order <- elim_order(M, ones(length(M))) # TODO: translate from findCliques.m
|
order <- elim_order(M, ones(length(M)))
|
||||||
G <- cliques <- root <- NULL
|
G <- cliques <- root <- NULL
|
||||||
c(G, cliques) %<-% triangulate(M, order) # TODO: translate from findCliques.m
|
c(G, cliques) %<-% triangulate(M, order)
|
||||||
c(jtree, root) %<-% cliques_to_jtree(cliques, ones(length(M))) # TODO: translate from findCliques.m
|
c(jtree, root) %<-% cliques_to_jtree(cliques, ones(length(M)))
|
||||||
ncliq <- length(cliques)
|
ncliq <- length(cliques)
|
||||||
separators <- cell(ncliq - 1, 1) # n - solmuisessa puussa n - 1 viivaa
|
separators <- cell(ncliq - 1, 1) # n - solmuisessa puussa n - 1 viivaa
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,14 +15,14 @@ triangulate <- function(G, order) {
|
||||||
u <- order[i]
|
u <- order[i]
|
||||||
U <- find(!eliminated)# uneliminated
|
U <- find(!eliminated)# uneliminated
|
||||||
nodes <- myintersect(neighbors(G, u), U)# look up neighbors in the partially filled - in graph
|
nodes <- myintersect(neighbors(G, u), U)# look up neighbors in the partially filled - in graph
|
||||||
nodes <- myunion(nodes, u)# the clique will always contain at least u # TODO: translate myunion
|
nodes <- myunion(nodes, u)# the clique will always contain at least u
|
||||||
G[nodes, nodes] <- 1# make them all connected to each other
|
G[nodes, nodes] <- 1# make them all connected to each other
|
||||||
G <- setdiag(G, 0) # TODO: translate setdiag
|
G <- setdiag(G, 0)
|
||||||
eliminated[u] <- 1
|
eliminated[u] <- 1
|
||||||
|
|
||||||
exclude <- 0
|
exclude <- 0
|
||||||
for (c in 1:length(cliques)) {
|
for (c in 1:length(cliques)) {
|
||||||
if (mysubset(nodes, cliques[[c]])) { # not maximal) # TODO: translate mysubset
|
if (mysubset(nodes, cliques[[c]])) { # not maximal)
|
||||||
exclude <- 1
|
exclude <- 1
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue