Bug fixes, code comments, and minor changes

4 files changed, 30 insertions, 6 deletions

diff --git a/sourcecodes/bnt-master/BNT/potentials/@cgpot/marginalize_pot.m b/sourcecodes/bnt-master/BNT/potentials/@cgpot/marginalize_pot.m
index 4e666b1a..e37e86a4 100644
--- a/sourcecodes/bnt-master/BNT/potentials/@cgpot/marginalize_pot.m
+++ b/sourcecodes/bnt-master/BNT/potentials/@cgpot/marginalize_pot.m
@@ -78,7 +78,7 @@ if 0 && bigpot.subtype == 'c'
   jdepends = 0;
   for i=1:I
     for j=2:J
-      if ~approxeq(h1(:,j,i), h1(:,1,i)) | ~approxeq(K1(:,:,j,i), K1(:,:,1,i))
+      if ~approxeq(h1(:,j,i), h1(:,1,i)) || ~approxeq(K1(:,:,j,i), K1(:,:,1,i))
 	jdepends = 1;
 	break
       end
diff --git a/sourcecodes/bnt-master/KPMstats/clg_Mstep.m b/sourcecodes/bnt-master/KPMstats/clg_Mstep.m
index b7da903b..1790819a 100644
--- a/sourcecodes/bnt-master/KPMstats/clg_Mstep.m
+++ b/sourcecodes/bnt-master/KPMstats/clg_Mstep.m
@@ -80,11 +80,11 @@ end
 
 %%% Estimate mean and regression 
 
-if ~isempty(clamped_weights) & ~isempty(clamped_mean)
+if ~isempty(clamped_weights) && ~isempty(clamped_mean)
   B = clamped_weights;
   mu = clamped_mean;
 end
-if ~isempty(clamped_weights) & isempty(clamped_mean)
+if ~isempty(clamped_weights) && isempty(clamped_mean)
   B = clamped_weights;
   % eqn 5
   mu = zeros(Ysz, Q);
@@ -92,7 +92,7 @@ if ~isempty(clamped_weights) & isempty(clamped_mean)
     mu(:,i) = (Y(:,i) - B(:,:,i)*X(:,i)) / w(i);
   end
 end
-if isempty(clamped_weights) & ~isempty(clamped_mean)
+if isempty(clamped_weights) && ~isempty(clamped_mean)
   mu = clamped_mean;
   % eqn 3
   B = zeros(Ysz, Xsz, Q);
@@ -102,7 +102,7 @@ if isempty(clamped_weights) & ~isempty(clamped_mean)
     B(:,:,i) = (XX(:,:,i) \ tmp')';
   end
 end
-if isempty(clamped_weights) & isempty(clamped_mean)
+if isempty(clamped_weights) && isempty(clamped_mean)
   mu = zeros(Ysz, Q);
   B = zeros(Ysz, Xsz, Q);
   % Nothing is clamped, so we must estimate B and mu jointly
diff --git a/sourcecodes/bnt-master/graph/findroot.m b/sourcecodes/bnt-master/graph/findroot.m
index d242a3a3..3f7b8d23 100644
--- a/sourcecodes/bnt-master/graph/findroot.m
+++ b/sourcecodes/bnt-master/graph/findroot.m
@@ -14,7 +14,7 @@ for i=1:length(cliques)
     % check hybrid cliques
     hc = intersect(cliques{i}, bnet.cnodes) ; 
     hd = intersect(cliques{i}, bnet.dnodes) ;
-    if ~isempty(hd) & ~isempty(hc)
+    if ~isempty(hd) && ~isempty(hc)
         nd = length(hd) ;
         if nd > n0
             root = i ;
diff --git a/sourcecodes/bnt-master/graph/findroot.m~ b/sourcecodes/bnt-master/graph/findroot.m~
new file mode 100644
index 00000000..d242a3a3
--- /dev/null
+++ b/sourcecodes/bnt-master/graph/findroot.m~
@@ -0,0 +1,24 @@
+function root = findroot(bnet, cliques)
+
+%% findroot is to find the strong root in a clique tree assume it has one
+%% in the tree. For a clique tree constructed from a strongly triangulated
+%% graph, an interface clique that contains all discrete parents
+%% and at least one continuous node from a connected continuous component
+%% is for sure to be available as a guaranteed strong root.
+%% -By Wei Sun, George Mason University, 4/17/2010.
+
+%% We choose the interface clique that contains the max number 
+%% of interface nodes to be the strong root.
+n0 = 0 ;
+for i=1:length(cliques)
+    % check hybrid cliques
+    hc = intersect(cliques{i}, bnet.cnodes) ; 
+    hd = intersect(cliques{i}, bnet.dnodes) ;
+    if ~isempty(hd) & ~isempty(hc)
+        nd = length(hd) ;
+        if nd > n0
+            root = i ;
+            n0 = nd ;
+        end
+    end    
+end