fixed logitvpiecewise

same issue here. Unary function evaluation has to be forced otherwise the array shape is not passed along fixed indent
shogun-toolbox · Feb 12, 2019 · c272db3 · c272db3
1 parent d906f09
commit c272db3
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/shogun/machine/gp/LogitVGPiecewiseBoundLikelihood.cpp b/src/shogun/machine/gp/LogitVGPiecewiseBoundLikelihood.cpp
@@ -502,11 +502,12 @@ void CLogitVGPiecewiseBoundLikelihood::precompute()
 
 	float64_t h_bak = eigen_h(eigen_h.size()-1);
 	eigen_h(eigen_h.size()-1) = 0;
-
 	//bsxfun(@plus, l.^2, v)
-	eigen_l2_plus_s2 = (eigen_s2.replicate(1,eigen_l.rows()).array().transpose().colwise() + eigen_l.array().pow(2)).matrix();
+	VectorXd epl_pow = eigen_l.array().pow(2);
+	VectorXd eph_pow = eigen_h.array().pow(2);
+	eigen_l2_plus_s2 = (eigen_s2.replicate(1,eigen_l.rows()).array().transpose().colwise() + epl_pow.array()).matrix();
 	//bsxfun(@plus, h.^2, v)
-	eigen_h2_plus_s2 = (eigen_s2.replicate(1,eigen_h.rows()).array().transpose().colwise() + eigen_h.array().pow(2)).matrix();
+	eigen_h2_plus_s2 = (eigen_s2.replicate(1,eigen_h.rows()).array().transpose().colwise() + eph_pow.array()).matrix();
 	//pl.*l - ph.*h
 	eigen_weighted_pdf_diff = (eigen_pl.array().colwise() * eigen_l.array() - eigen_ph.array().colwise() * eigen_h.array()).matrix();