fixed compilation error with double type (#17)

fixed conflicts with SpecialFunctionsPacketMath (#18)
bab2min · Mar 30, 2021 · 272de5e · 272de5e
1 parent e05c851
commit 272de5e
Show file tree

Hide file tree

Showing 8 changed files with 878 additions and 141 deletions.
diff --git a/EigenRand/Dists/Discrete.h b/EigenRand/Dists/Discrete.h
@@ -825,7 +825,7 @@ namespace Eigen
 						fres = ptruncate(padd(pmul(psqrt_tmean, yx), pmean));
 
 						auto p1 = pmul(padd(pmul(yx, yx), pset1<PacketType>(1)), pset1<PacketType>(0.9));
-						auto p2 = pexp(psub(psub(pmul(fres, plog_mean), plgamma(padd(fres, pset1<PacketType>(1)))), pg1));
+						auto p2 = pexp(psub(psub(pmul(fres, plog_mean), plgamma_approx(padd(fres, pset1<PacketType>(1)))), pg1));
 
 						auto c1 = pcmple(pset1<PacketType>(0), fres);
 						auto c2 = pcmple(ur.template packetOp<PacketType>(rng), pmul(p1, p2));
@@ -964,8 +964,8 @@ namespace Eigen
 						auto p1 = pmul(pmul(pset1<PacketType>(1.2), psqrt_v), padd(pset1<PacketType>(1), pmul(ys, ys)));
 						auto p2 = pexp(
 							padd(padd(psub(
-								psub(pg1, plgamma(padd(fres, pset1<PacketType>(1)))),
-								plgamma(psub(padd(ptrials, pset1<PacketType>(1)), fres))
+								psub(pg1, plgamma_approx(padd(fres, pset1<PacketType>(1)))),
+								plgamma_approx(psub(padd(ptrials, pset1<PacketType>(1)), fres))
 							), pmul(fres, plog_small_p)), pmul(psub(ptrials, fres), plog_small_q))
 						);
 

diff --git a/EigenRand/Dists/GammaPoisson.h b/EigenRand/Dists/GammaPoisson.h
@@ -81,7 +81,7 @@ namespace Eigen
 					const PacketType ppi = pset1<PacketType>(constant::pi),
 						psqrt_tmean = psqrt(pmul(pset1<PacketType>(2), mean)),
 						plog_mean = plog(mean),
-						pg1 = psub(pmul(mean, plog_mean), plgamma(padd(mean, pset1<PacketType>(1))));
+						pg1 = psub(pmul(mean, plog_mean), plgamma_approx(padd(mean, pset1<PacketType>(1))));
 					while (1)
 					{
 						PacketType fres, yx, psin, pcos;
@@ -90,7 +90,7 @@ namespace Eigen
 						fres = ptruncate(padd(pmul(psqrt_tmean, yx), mean));
 
 						auto p1 = pmul(padd(pmul(yx, yx), pset1<PacketType>(1)), pset1<PacketType>(0.9));
-						auto p2 = pexp(psub(psub(pmul(fres, plog_mean), plgamma(padd(fres, pset1<PacketType>(1)))), pg1));
+						auto p2 = pexp(psub(psub(pmul(fres, plog_mean), plgamma_approx(padd(fres, pset1<PacketType>(1)))), pg1));
 
 						auto c1 = pcmple(pset1<PacketType>(0), fres);
 						auto c2 = pcmple(ur.template packetOp<PacketType>(rng), pmul(p1, p2));

diff --git a/EigenRand/Dists/NormalExp.h b/EigenRand/Dists/NormalExp.h
@@ -238,8 +238,7 @@ namespace Eigen
 					psub(pexp(pmul(plog(u1), pset1<Packet>(-2 / n))), pset1<Packet>(1))
 				));
 				auto theta = pmul(pset1<Packet>(2 * constant::pi), u2);
-				Packet sintheta, costheta;
-
+				//Packet sintheta, costheta;
 				//psincos(theta, sintheta, costheta);
 				return pmul(radius, psin(theta));
 			}