tomoto 0.1.3 → 0.1.4

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

@@ -153,28 +153,32 @@ namespace tomoto
 		inline float lgammaT(float x) { return detail::LUT_lgamma::get(x); }
 		inline float digammaT(float x) { return detail::LUT_digamma::get(x); }
 
+		// approximation : lgamma(z) ~= (z+2.5)ln(z+3) - z - 3 + 0.5 ln (2pi) + 1/12/(z + 3) - ln (z(z+1)(z+2))
 		template<class _T>
 		inline auto lgammaApprox(_T z) -> decltype((z + 2.5)* log(z + 3) - (z + 3) + 0.91893853 + 1. / 12. / (z + 3) - log(z * (z + 1) * (z + 2)))
 		{
-			// approximation : lgamma(z) ~= (z+2.5)ln(z+3) - z - 3 + 0.5 ln (2pi) + 1/12/(z + 3) - ln (z(z+1)(z+2))
 			return (z + 2.5) * log(z + 3) - (z + 3) + 0.91893853 + 1. / 12. / (z + 3) - log(z * (z + 1) * (z + 2));
 		}
 
+		// calc lgamma(z + a) - lgamma(z)
 		template<class _T, class _U>
-		inline _T lgammaSubt(_T z, _U a) // calc lgamma(z + a) - lgamma(z)
+		inline auto lgammaSubt(_T z, _U a) -> decltype((z + a + 1.5)* log(z + a + 2) - (z + 1.5) * log(z + 2) - a + (1. / (z + a + 2) - 1. / (z + 2)) / 12. - log(((z + a) * (z + a + 1)) / (z * (z + 1))))
 		{
 			return (z + a + 1.5) * log(z + a + 2) - (z + 1.5) * log(z + 2) - a + (1. / (z + a + 2) - 1. / (z + 2)) / 12. - log(((z + a) * (z + a + 1)) / (z * (z + 1)));
 		}
 
+		// approximation : digamma(z) ~= ln(z+4) - 1/2/(z+4) - 1/12/(z+4)^2 - 1/z - 1/(z+1) - 1/(z+2) - 1/(z+3)
 		template<class _T>
 		inline auto digammaApprox(_T z) -> decltype(log(z + 4) - 1. / 2. / (z + 4) - 1. / 12. / ((z + 4) * (z + 4)) - 1. / z - 1. / (z + 1) - 1. / (z + 2) - 1. / (z + 3))
 		{
-			// approximation : digamma(z) ~= ln(z+4) - 1/2/(z+4) - 1/12/(z+4)^2 - 1/z - 1/(z+1) - 1/(z+2) - 1/(z+3)
 			return log(z + 4) - 1. / 2. / (z + 4) - 1. / 12. / ((z + 4) * (z + 4)) - 1. / z - 1. / (z + 1) - 1. / (z + 2) - 1. / (z + 3);
 		}
 
+		// calc digamma(z + a) - digamma(z)
 		template<class _T, class _U>
-		inline _T digammaSubt(_T z, _U a) // calc digamma(z + a) - digamma(z)
+		inline auto digammaSubt(_T z, _U a) -> decltype(log((z + a + 2) / (z + 2)) - (1 / (z + a + 2) - 1 / (z + 2)) / 2 - (1 / (z + a + 2) / (z + a + 2) - 1 / (z + 2) / (z + 2)) / 12
+			- 1. / (z + a) - 1. / (z + a + 1)
+			- 1. / z - 1. / (z + 1))
 		{
 			return log((z + a + 2) / (z + 2)) - (1 / (z + a + 2) - 1 / (z + 2)) / 2 - (1 / (z + a + 2) / (z + a + 2) - 1 / (z + 2) / (z + 2)) / 12
 				- 1. / (z + a) - 1. / (z + a + 1)

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

@@ -172,10 +172,14 @@ namespace tomoto
 
 		reverse_iterator rbegin() noexcept { return reverse_iterator(_last); }
 
+		const_reverse_iterator rbegin() const noexcept { return reverse_iterator(_last); }
+
 		const_reverse_iterator crbegin() const noexcept { return reverse_iterator(_last); }
 
 		reverse_iterator rend() noexcept { return reverse_iterator(_first); }
 
+		const_reverse_iterator rend() const noexcept { return reverse_iterator(_first); }
+
 		const_reverse_iterator crend() const noexcept { return reverse_iterator(_first); }
 
 		// 23.3.11.3, capacity:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tomoto
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-19 00:00:00.000000000 Z
+date: 2021-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -24,64 +24,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
 description:
-email: andrew@chartkick.com
+email: andrew@ankane.org
 executables: []
 extensions:
 - ext/tomoto/extconf.rb
@@ -90,8 +34,22 @@ files:
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
+- ext/tomoto/ct.cpp
+- ext/tomoto/dmr.cpp
+- ext/tomoto/dt.cpp
 - ext/tomoto/ext.cpp
 - ext/tomoto/extconf.rb
+- ext/tomoto/gdmr.cpp
+- ext/tomoto/hdp.cpp
+- ext/tomoto/hlda.cpp
+- ext/tomoto/hpa.cpp
+- ext/tomoto/lda.cpp
+- ext/tomoto/llda.cpp
+- ext/tomoto/mglda.cpp
+- ext/tomoto/pa.cpp
+- ext/tomoto/plda.cpp
+- ext/tomoto/slda.cpp
+- ext/tomoto/utils.h
 - lib/tomoto.rb
 - lib/tomoto/ct.rb
 - lib/tomoto/dmr.rb
@@ -106,6 +64,8 @@ files:
 - lib/tomoto/pa.rb
 - lib/tomoto/plda.rb
 - lib/tomoto/slda.rb
+- lib/tomoto/tomoto.bundle
+- lib/tomoto/tomoto.so
 - lib/tomoto/version.rb
 - vendor/EigenRand/EigenRand/Core.h
 - vendor/EigenRand/EigenRand/Dists/Basic.h
@@ -446,6 +406,7 @@ files:
 - vendor/tomotopy/src/Labeling/FoRelevance.cpp
 - vendor/tomotopy/src/Labeling/FoRelevance.h
 - vendor/tomotopy/src/Labeling/Labeler.h
+- vendor/tomotopy/src/Labeling/Phraser.hpp
 - vendor/tomotopy/src/TopicModel/CT.h
 - vendor/tomotopy/src/TopicModel/CTModel.cpp
 - vendor/tomotopy/src/TopicModel/CTModel.hpp
@@ -484,6 +445,9 @@ files:
 - vendor/tomotopy/src/TopicModel/PLDA.h
 - vendor/tomotopy/src/TopicModel/PLDAModel.cpp
 - vendor/tomotopy/src/TopicModel/PLDAModel.hpp
+- vendor/tomotopy/src/TopicModel/PT.h
+- vendor/tomotopy/src/TopicModel/PTModel.cpp
+- vendor/tomotopy/src/TopicModel/PTModel.hpp
 - vendor/tomotopy/src/TopicModel/SLDA.h
 - vendor/tomotopy/src/TopicModel/SLDAModel.cpp
 - vendor/tomotopy/src/TopicModel/SLDAModel.hpp
@@ -542,7 +506,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: High performance topic modeling for Ruby