bug fix & renaming of a variable

kzahedi · Apr 3, 2019 · 99fea2f · 99fea2f
1 parent 985b1d2
commit 99fea2f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/discrete/sparse/ConditionalMutualInformation.go b/discrete/sparse/ConditionalMutualInformation.go
@@ -38,13 +38,13 @@ func ConditionalMutualInformation(pxyz sm.SparseMatrix, ln lnFunc) float64 {
 	}
 
 	for _, index := range pxCz.Indices {
-		zi := sm.SparseMatrixIndex{index[2]}
+		zi := sm.SparseMatrixIndex{index[1]}
 		v, _ := pz.Get(zi)
 		pxCz.Mul(zi, 1.0/v)
 	}
 
 	for _, index := range pyCz.Indices {
-		zi := sm.SparseMatrixIndex{index[2]}
+		zi := sm.SparseMatrixIndex{index[1]}
 		v, _ := pz.Get(zi)
 		pyCz.Mul(zi, 1.0/v)
 	}
@@ -58,7 +58,7 @@ func ConditionalMutualInformation(pxyz sm.SparseMatrix, ln lnFunc) float64 {
 		xyz, _ := pxyz.Get(index)
 		xyCz, _ := pxyCz.Get(index)
 		xCz, _ := pxCz.Get(sm.SparseMatrixIndex{xi, zi})
-		yCz, _ := pxCz.Get(sm.SparseMatrixIndex{yi, zi})
+		yCz, _ := pyCz.Get(sm.SparseMatrixIndex{yi, zi})
 
 		if xyz > 0.0 && xyCz > 0.0 && xCz > 0.0 && yCz > 0.0 {
 			r += xyz * (ln(xyCz) - ln(xCz*yCz))

diff --git a/discrete/sparse/MutualInformation.go b/discrete/sparse/MutualInformation.go
@@ -24,7 +24,7 @@ func MutualInformation(pxy sm.SparseMatrix, log lnFunc) float64 {
 		py.Add(y, v)
 	}
 
-	mi := 0.0
+	var r float64
 
 	for _, index := range pxy.Indices {
 		x := sm.SparseMatrixIndex{index[0]}
@@ -34,11 +34,11 @@ func MutualInformation(pxy sm.SparseMatrix, log lnFunc) float64 {
 		yv, _ := py.Get(y)
 
 		if xyv > 0.0 && xv > 0.0 && yv > 0.0 {
-			mi += xyv * (log(xyv) - log(xv*yv))
+			r += xyv * (log(xyv) - log(xv*yv))
 		}
 	}
 
-	return mi
+	return r
 }
 
 // MutualInformationBaseE calculates the mutual information with base e