fix Wbitwise-instead-of-logical warning (#3)

lixun910 · web-flow · commit a9a3d0a3212d · 2022-04-09T23:35:31.000-07:00
diff --git a/clustering/fastcluster.h b/clustering/fastcluster.h
@@ -897,7 +897,7 @@ namespace fastcluster {
             NTT = 0;
             NXO = 0;
             for (t_index k=0; k<dim; ++k) {
-                NTT += (Xb(i,k) &  Xb(j,k)) ;
+                NTT += (Xb(i,k) &&  Xb(j,k)) ;
                 NXO += (Xb(i,k) ^  Xb(j,k)) ;
             }
         }
@@ -907,7 +907,7 @@ namespace fastcluster {
             NXO = 0;
             NTF = 0;
             for (t_index k=0; k<dim; ++k) {
-                NTT += (Xb(i,k) &  Xb(j,k)) ;
+                NTT += (Xb(i,k) &&  Xb(j,k)) ;
                 NXO += (Xb(i,k) ^  Xb(j,k)) ;
                 NTF += (Xb(i,k) & ~Xb(j,k)) ;
             }
@@ -925,7 +925,7 @@ namespace fastcluster {
         void nbool_correspond_tt(const t_index i, const t_index j) const {
             NTT = 0;
             for (t_index k=0; k<dim; ++k) {
-                NTT += (Xb(i,k) & Xb(j,k)) ;
+                NTT += (Xb(i,k) && Xb(j,k)) ;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -897,7 +897,7 @@ namespace fastcluster {`
`897`	`897`	`NTT = 0;`
`898`	`898`	`NXO = 0;`
`899`	`899`	`for (t_index k=0; k<dim; ++k) {`
`900`		`- NTT += (Xb(i,k) & Xb(j,k)) ;`
	`900`	`+ NTT += (Xb(i,k) && Xb(j,k)) ;`
`901`	`901`	`NXO += (Xb(i,k) ^ Xb(j,k)) ;`
`902`	`902`	`}`
`903`	`903`	`}`
`@@ -907,7 +907,7 @@ namespace fastcluster {`
`907`	`907`	`NXO = 0;`
`908`	`908`	`NTF = 0;`
`909`	`909`	`for (t_index k=0; k<dim; ++k) {`
`910`		`- NTT += (Xb(i,k) & Xb(j,k)) ;`
	`910`	`+ NTT += (Xb(i,k) && Xb(j,k)) ;`
`911`	`911`	`NXO += (Xb(i,k) ^ Xb(j,k)) ;`
`912`	`912`	`NTF += (Xb(i,k) & ~Xb(j,k)) ;`
`913`	`913`	`}`
`@@ -925,7 +925,7 @@ namespace fastcluster {`
`925`	`925`	`void nbool_correspond_tt(const t_index i, const t_index j) const {`
`926`	`926`	`NTT = 0;`
`927`	`927`	`for (t_index k=0; k<dim; ++k) {`
`928`		`- NTT += (Xb(i,k) & Xb(j,k)) ;`
	`928`	`+ NTT += (Xb(i,k) && Xb(j,k)) ;`
`929`	`929`	`}`
`930`	`930`	`}`
`931`	`931`