vendor/tomotopy/src/TopicModel/LDACVB0Model.hpp in tomoto-0.2.2 vs vendor/tomotopy/src/TopicModel/LDACVB0Model.hpp in tomoto-0.2.3

@@ -80,11 +80,11 @@
 		using DerivedClass = typename std::conditional<std::is_same<_Derived, void>::value, LDACVB0Model, _Derived>::type;
 		using BaseClass = TopicModel<0, _Interface, DerivedClass, _DocType, _ModelState>;
 		friend BaseClass;
 
 		static constexpr const char TWID[] = "one\0";
-		static constexpr static constexpr char TMID[] = "LDA\0";
+		static constexpr const char TMID[] = "LDA\0";
 
 		Float alpha;
 		Vector alphas;
 		Float eta;
 		Tid K;
@@ -123,11 +123,11 @@
 			zLikelihood /= zLikelihood.sum() + 1e-10;
 			return zLikelihood;
 		}
 
 		template<int _Inc, typename _Vec>
-		inline void addWordTo(_ModelState& ld, _DocType& doc, uint32_t pid, Vid vid, _Vec tDist) const
+		inline void addWordTo(_ModelState& ld, _DocType& doc, size_t pid, Vid vid, _Vec tDist) const
 		{
 			assert(vid < this->realV);
 			constexpr bool _dec = _Inc < 0;
 			doc.numByTopic += _Inc * tDist;
 			if (_dec) doc.numByTopic = doc.numByTopic.cwiseMax(0);
@@ -390,10 +390,10 @@
 		std::vector<size_t> getCountByTopic() const override
 		{
 			return static_cast<const DerivedClass*>(this)->_getTopicsCount();
 		}
 
-		std::vector<Float> getTopicsByDoc(const _DocType& doc) const
+		std::vector<Float> _getTopicsByDoc(const _DocType& doc) const
 		{
 			std::vector<Float> ret(K);
 			Float sum = doc.getSumWordWeight() + K * alpha;
 			transform(doc.numByTopic.data(), doc.numByTopic.data() + K, ret.begin(), [sum, this](size_t n)
 			{
\ No newline at end of file