tomoto 0.2.2 → 0.2.3

data/vendor/tomotopy/src/Utils/AliasMethod.hpp

@@ -35,11 +35,12 @@ namespace tomoto
 				bitsize = o.bitsize;
 				if (msize)
 				{
-					arr = std::make_unique<_Precision[]>(1 << bitsize);
-					alias = std::make_unique<size_t[]>(1 << bitsize);
+					size_t n = (size_t)1 << bitsize;
+					arr = std::make_unique<_Precision[]>(n);
+					alias = std::make_unique<size_t[]>(n);
 
-					std::copy(o.arr.get(), o.arr.get() + (1 << bitsize), arr.get());
-					std::copy(o.alias.get(), o.alias.get() + (1 << bitsize), alias.get());
+					std::copy(o.arr.get(), o.arr.get() + n, arr.get());
+					std::copy(o.alias.get(), o.alias.get() + n, alias.get());
 				}
 				return *this;
 			}

data/vendor/tomotopy/src/Utils/Dictionary.h

@@ -32,7 +32,7 @@ namespace tomoto
 			auto it = dict.find(word);
 			if (it == dict.end())
 			{
-				dict.emplace(std::make_pair(word, dict.size()));
+				dict.emplace(word, (Vid)dict.size());
 				id2word.emplace_back(word);
 				return (Vid)(dict.size() - 1);
 			}
@@ -64,7 +64,7 @@ namespace tomoto
 			serializer::readMany(reader, serializer::to_key("Dict"), id2word);
 			for (size_t i = 0; i < id2word.size(); ++i)
 			{
-				dict.emplace(id2word[i], i);
+				dict.emplace(id2word[i], (Vid)i);
 			}
 		}
 

data/vendor/tomotopy/src/Utils/MultiNormalDistribution.hpp

@@ -10,7 +10,7 @@ namespace tomoto
 		template<typename _Ty = float>
 		struct MultiNormalDistribution
 		{
-			static constexpr _Ty log2pi = 1.83787706641;
+			static constexpr _Ty log2pi = (_Ty)1.83787706641;
 			Eigen::Matrix<_Ty, -1, 1> mean;
 			Eigen::Matrix<_Ty, -1, -1> cov, l;
 			_Ty logDet = 0;

data/vendor/tomotopy/src/Utils/TruncMultiNormal.hpp

@@ -58,7 +58,7 @@ namespace tomoto
 					}
 					else
 					{
-						z[j] = rtnorm::rtnorm(rng, lower_pos, upper_pos);
+						z[j] = (_Ty)rtnorm::rtnorm(rng, lower_pos, upper_pos);
 					}
 				}
 			}

data/vendor/tomotopy/src/Utils/math.h

@@ -141,9 +141,9 @@ namespace tomoto
 				float forSmall(float x) 
 				{
 					if (x == 0) return -INFINITY;
-					return log(x + 2) - 0.5f / (x + 2) - 1 / 12.f / pow(x + 2, 2) - 1 / (x + 1) - 1 / x; 
+					return logf(x + 2) - 0.5f / (x + 2) - 1 / 12.f / powf(x + 2, 2) - 1 / (x + 1) - 1 / x; 
 				}
-				float forLarge(float x) { return log(x) - 0.5f / x - 1 / 12.f / pow(x, 2); }
+				float forLarge(float x) { return logf(x) - 0.5f / x - 1 / 12.f / powf(x, 2); }
 				float forNonFinite(float x) { if (std::isnan(x) || x < 0) return NAN; return INFINITY;}
 			};
 

data/vendor/tomotopy/src/Utils/serializer.hpp

@@ -89,7 +89,7 @@ namespace tomoto
 			template<> struct gen_seq<1> : seq<0> {};
 
 			template <size_t _n, size_t ... _is>
-			std::array<char, _n - 1> to_array(const char(&a)[_n], seq<_is...>)
+			constexpr std::array<char, sizeof... (_is)> to_array(const char(&a)[_n], seq<_is...>)
 			{
 				return { {a[_is]...} };
 			}
@@ -101,7 +101,13 @@ namespace tomoto
 			}
 
 			template <size_t _n, size_t ... _is>
-			std::array<char, _n> to_arrayz(const char(&a)[_n], seq<_is...>)
+			constexpr std::array<char, sizeof... (_is) + 1> to_arrayz(const char(&a)[_n], seq<_is...>)
+			{
+				return { {a[_is]..., 0} };
+			}
+
+			template <size_t _n, size_t ... _is>
+			constexpr std::array<char, sizeof... (_is) + 1> to_arrayz(const std::array<char, _n>& a, seq<_is...>)
 			{
 				return { {a[_is]..., 0} };
 			}
@@ -132,17 +138,24 @@ namespace tomoto
 				return std::string{ m.begin(), m.end() };
 			}
 
-			Key(const std::array<char, _len>& _m) : m(_m)
+			constexpr Key(const std::array<char, _len>& _m) : m(_m)
 			{
 			}
 
-			Key(std::array<char, _len>&& _m) : m(_m)
+			constexpr Key(std::array<char, _len>&& _m) : m(_m)
 			{
 			}
 
-			Key(const char(&a)[_len + 1]) : Key{ detail::to_array(a) }
+			constexpr Key(const char(&a)[_len + 1]) : Key{ detail::to_array(a) }
 			{
 			}
+
+			constexpr char operator[](size_t n) const
+			{
+				return n < _len ? m[n] : throw std::out_of_range("");
+			}
+
+			constexpr size_t size() const { return _len; }
 		};
 
 		template<typename _Ty>
@@ -161,12 +174,24 @@ namespace tomoto
 			return Key<_n - 1>{detail::to_array(a)};
 		}
 
+		template<size_t _n>
+		constexpr Key<_n> to_key(const Key<_n>& key)
+		{
+			return key;
+		}
+
 		template<size_t _n>
 		constexpr Key<_n> to_keyz(const char(&a)[_n])
 		{
 			return Key<_n>{detail::to_arrayz(a)};
 		}
 
+		template<size_t _n>
+		constexpr Key<_n + 1> to_keyz(const Key<_n>& key)
+		{
+			return Key<_n + 1>{detail::to_arrayz(key.m, detail::GenSeq<_n>{})};
+		}
+
 		template<typename _Ty, typename = void>
 		struct Serializer;
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tomoto
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 description:
 email: andrew@ankane.org
 executables: []