tomoto 0.2.2 → 0.3.0

data/vendor/EigenRand/EigenRand/Dists/NormalExp.h

@@ -2,10 +2,10 @@
  * @file NormalExp.h
  * @author bab2min (bab2min@gmail.com)
  * @brief 
- * @version 0.3.0
- * @date 2020-10-07
+ * @version 0.3.3
+ * @date 2021-03-31
  * 
- * @copyright Copyright (c) 2020
+ * @copyright Copyright (c) 2020-2021
  * 
  */
 
@@ -27,7 +27,7 @@ namespace Eigen
 		{
 			static_assert(std::is_floating_point<_Scalar>::value, "normalDist needs floating point types.");
 			bool valid = false;
-			UniformRealGen<_Scalar> ur;
+			StdUniformRealGen<_Scalar> ur;
 			
 		public:
 			using Scalar = _Scalar;
@@ -44,8 +44,9 @@ namespace Eigen
 				valid = true;
 
 				_Scalar v1, v2, sx;
-				while (1)
+				for (int _i = 0; ; ++_i)
 				{
+					EIGENRAND_CHECK_INFINITY_LOOP();
 					v1 = 2 * ur(rng) - 1;
 					v2 = 2 * ur(rng) - 1;
 					sx = v1 * v1 + v2 * v2;
@@ -186,7 +187,7 @@ namespace Eigen
 		class StudentTGen : public GenBase<StudentTGen<_Scalar>, _Scalar>
 		{
 			static_assert(std::is_floating_point<_Scalar>::value, "studentT needs floating point types.");
-			UniformRealGen<_Scalar> ur;
+			StdUniformRealGen<_Scalar> ur;
 			_Scalar n;
 
 		public:
@@ -213,8 +214,9 @@ namespace Eigen
 			{
 				using namespace Eigen::internal;
 				_Scalar v1, v2, sx;
-				while (1)
+				for (int _i = 0; ; ++_i)
 				{
+					EIGENRAND_CHECK_INFINITY_LOOP();
 					v1 = 2 * ur(rng) - 1;
 					v2 = 2 * ur(rng) - 1;
 					sx = v1 * v1 + v2 * v2;
@@ -238,8 +240,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));
 			}
@@ -257,7 +258,7 @@ namespace Eigen
 		{
 			friend GammaGen<_Scalar>;
 			static_assert(std::is_floating_point<_Scalar>::value, "expDist needs floating point types.");
-			UniformRealGen<_Scalar> ur;
+			StdUniformRealGen<_Scalar> ur;
 			_Scalar lambda = 1;
 
 		public:
@@ -325,7 +326,7 @@ namespace Eigen
 			GammaGen(_Scalar _alpha = 1, _Scalar _beta = 1)
 				: alpha{ _alpha }, beta{ _beta }
 			{
-				px = constant::e / (alpha + constant::e);
+				px = (_Scalar)(constant::e / (alpha + constant::e));
 				sqrt = std::sqrt(2 * alpha - 1);
 			}
 
@@ -342,8 +343,9 @@ namespace Eigen
 				if (alpha < 1)
 				{
 					_Scalar ux, vx, xx, qx;
-					while (1)
+					for (int _i = 0; ; ++_i)
 					{
+						EIGENRAND_CHECK_INFINITY_LOOP();
 						ux = expon.ur(rng);
 						vx = expon.ur.nzur_scalar(rng);
 
@@ -380,8 +382,9 @@ namespace Eigen
 					return -beta * std::log(yx);
 				}
 
-				while (1)
+				for (int _i = 0; ; ++_i)
 				{
+					EIGENRAND_CHECK_INFINITY_LOOP();
 					_Scalar yx, xx;
 					yx = std::tan(constant::pi * expon.ur(rng));
 					xx = sqrt * yx + alpha - 1;
@@ -404,8 +407,9 @@ namespace Eigen
 				RUtils ru;
 				if (alpha < 1)
 				{
-					while (1)
+					for (int _i = 0; ; ++_i)
 					{
+						EIGENRAND_CHECK_INFINITY_LOOP();
 						Packet ux = ru.uniform_real(rng);
 						Packet vx = ru.nonzero_uniform_real(rng);
 
@@ -447,8 +451,9 @@ namespace Eigen
 				}
 				else
 				{
-					while (1)
+					for (int _i = 0; ; ++_i)
 					{
+						EIGENRAND_CHECK_INFINITY_LOOP();
 						Packet alpha_1 = pset1<Packet>(alpha - 1);
 						Packet ys, yc;
 						psincos(pmul(pset1<Packet>(constant::pi), ru.uniform_real(rng)), ys, yc);
@@ -482,7 +487,7 @@ namespace Eigen
 		class WeibullGen : public GenBase<WeibullGen<_Scalar>, _Scalar>
 		{
 			static_assert(std::is_floating_point<_Scalar>::value, "weilbullDist needs floating point types.");
-			UniformRealGen<_Scalar> ur;
+			StdUniformRealGen<_Scalar> ur;
 			_Scalar a = 1, b = 1;
 
 		public:
@@ -531,7 +536,7 @@ namespace Eigen
 		class ExtremeValueGen : public GenBase<ExtremeValueGen<_Scalar>, _Scalar>
 		{
 			static_assert(std::is_floating_point<_Scalar>::value, "extremeValueDist needs floating point types.");
-			UniformRealGen<_Scalar> ur;
+			StdUniformRealGen<_Scalar> ur;
 			_Scalar a = 0, b = 1;
 
 		public:
@@ -623,7 +628,7 @@ namespace Eigen
 		class CauchyGen : public GenBase<CauchyGen<_Scalar>, _Scalar>
 		{
 			static_assert(std::is_floating_point<_Scalar>::value, "cauchyDist needs floating point types.");
-			UniformRealGen<_Scalar> ur; 
+			StdUniformRealGen<_Scalar> ur;
 			_Scalar a = 0, b = 1;
 
 		public:
@@ -680,7 +685,7 @@ namespace Eigen
 			friend FisherFGen<_Scalar>;
 			static_assert(std::is_floating_point<_Scalar>::value, "betaDist needs floating point types.");
 			int cache_rest_cnt = 0;
-			UniformRealGen<_Scalar> ur;
+			StdUniformRealGen<_Scalar> ur;
 			_Scalar a, b;
 			GammaGen<_Scalar> gd1, gd2;
 
@@ -711,8 +716,9 @@ namespace Eigen
 				if (a < 1 && b < 1)
 				{
 					_Scalar x, p1, p2;
-					while (1)
+					for (int _i = 0; ; ++_i)
 					{
+						EIGENRAND_CHECK_INFINITY_LOOP();
 						p1 = std::pow(ur(rng), 1 / a);
 						p2 = std::pow(ur(rng), 1 / b);
 						x = p1 + p2;
@@ -735,8 +741,9 @@ namespace Eigen
 				{
 					auto& cm = Rand::detail::CompressMask<sizeof(Packet)>::get_inst();
 					Packet x, p1, p2;
-					while (1)
+					for (int _i = 0; ; ++_i)
 					{
+						EIGENRAND_CHECK_INFINITY_LOOP();
 						p1 = pexp(pmul(plog(ur.template packetOp<Packet>(rng)), pset1<Packet>(1 / a)));
 						p2 = pexp(pmul(plog(ur.template packetOp<Packet>(rng)), pset1<Packet>(1 / b)));
 						x = padd(p1, p2);

data/vendor/EigenRand/EigenRand/EigenRand

@@ -2,10 +2,10 @@
  * @file EigenRand
  * @author bab2min (bab2min@gmail.com)
  * @brief 
- * @version 0.3.0
- * @date 2020-10-07
+ * @version 0.4.0
+ * @date 2021-09-17
  * 
- * @copyright Copyright (c) 2020
+ * @copyright Copyright (c) 2020-2021
  * 
  */
 
@@ -13,7 +13,12 @@
 #define EIGENRAND_EIGENRAND_H
 
 #include <Eigen/Dense>
-#include <EigenRand/Macro.h>
-#include <EigenRand/Core.h>
 
-#endif
+#include <Eigen/src/Core/util/DisableStupidWarnings.h>
+
+#include "Macro.h"
+#include "Core.h"
+
+#include <Eigen/src/Core/util/ReenableStupidWarnings.h>
+
+#endif

data/vendor/EigenRand/EigenRand/Macro.h

@@ -2,10 +2,10 @@
  * @file Macro.h
  * @author bab2min (bab2min@gmail.com)
  * @brief 
- * @version 0.3.0
- * @date 2020-10-07
+ * @version 0.4.0
+ * @date 2021-09-28
  * 
- * @copyright Copyright (c) 2020
+ * @copyright Copyright (c) 2020-2021
  * 
  */
 
@@ -13,12 +13,18 @@
 #define EIGENRAND_MACRO_H
 
 #define EIGENRAND_WORLD_VERSION 0
-#define EIGENRAND_MAJOR_VERSION 3
-#define EIGENRAND_MINOR_VERSION 2
+#define EIGENRAND_MAJOR_VERSION 4
+#define EIGENRAND_MINOR_VERSION 0
 
-#if EIGEN_VERSION_AT_LEAST(3,3,7)
+#if EIGEN_VERSION_AT_LEAST(3,3,10)
+#define EIGENRAND_EIGEN_34_MODE
+#elif EIGEN_VERSION_AT_LEAST(3,3,4)
+#define EIGENRAND_EIGEN_33_MODE
+#endif
+
+#if EIGEN_VERSION_AT_LEAST(3,3,4) && !EIGEN_VERSION_AT_LEAST(3,4,1)
 #else
-#error At least Eigen 3.3.7 is required.
+#error Eigen 3.3.4 ~ 3.4.0 is required.
 #endif
 
 #endif