diarize-ruby 0.3.12 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf974c96cf25699a635fe8adceff3839eb519dfd
-  data.tar.gz: dd4b2a3ee90d2893640110dc7b46a86086f9da56
+  metadata.gz: 7a8425adb99358b3c4fbaaeaf441f2f883a58f66
+  data.tar.gz: 7560243b10d08151264245f0c6e5a7aa4c04d158
 SHA512:
-  metadata.gz: 9c12516dc25bd04468c4d771b29c848305807bf8a4fe3e7de2a6a64c3c45ca73aaf98cc067e2bf92890682eb5b353698c6fb1a9c1b46c677da7d83be4b119cbd
-  data.tar.gz: 06e93c8f82a8b3ffeb9f9fc3a7b01ee06368ef91edf55747f349af80cad91839cc5385760c8024e66ea47d447956d20b4abb072f898d4e0ab9e0979ba92b9a09
+  metadata.gz: 63b8bb8e3540128016fe975acb85f753b4102fdea4950596e36d029a978d437e7d847ea37f8c3cde113c7044f71251a659be848b701e5c54cb001de5c9034456
+  data.tar.gz: f97fa7b06cba6949cbae44ca3a3d532327d72a6dadfbef5c26165e0da7d7d5b17477afeedddd8a1c95cce108b4f54793491a939f40f528b44f6c9364c42f2e2b

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [v0.4.0] - 2016-11-15
+
+- Add ruby GSL Math library
+
+## [v0.3.12] - 2016-11-14
+
+- Alias `_as_json` and `_to_json` to be used for Drb objects
+
 ## [v0.3.11] - 2016-11-30
 
 - Add `Segment#as_json` and `Segment#to_json`

data/diarize-ruby.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "rjb", "~> 1.5"
   spec.add_dependency "to-rdf", "~> 0"
-  spec.add_dependency "jblas-ruby", "~> 1.1"
+  spec.add_dependency "gsl", "~> 2"
 
   spec.add_runtime_dependency('gli', '~> 2.13.0')
 end

data/lib/diarize.rb

@@ -5,12 +5,11 @@ RJB_OPTIONS   = ['-Xms16m', '-Xmx1024m']
 
 Rjb::load(RJB_LOAD_PATH, RJB_OPTIONS)
 
-require "matrix"
-
 require "uri"
 require "open-uri"
 require "digest"
 require "to_rdf"
+require "gsl"
 
 require "rjb/java_object_wrapper"
 

data/lib/diarize/super_vector.rb

@@ -3,7 +3,7 @@ module Diarize
     attr_reader :vector
 
     def initialize(vector)
-      @vector = vector.is_a?(Array) ? Vector.elements(vector) : vector
+      @vector = vector
     end
 
     class << self
@@ -11,29 +11,28 @@ module Diarize
       def generate_from_model(model)
         # Generates a supervector from a LIUM GMM
         dim = model.nb_of_components * model.components.get(0).dim
-        vector = Array.new(dim, 0)
+        vector = GSL::Vector::alloc(dim)
         model.nb_of_components.times do |k|
           gaussian = model.components.get(k)
           gaussian.dim.times do |i|
             vector[k * gaussian.dim + i] = gaussian.mean(i)
           end
         end
-        SuperVector.new(Vector.elements(vector))
+        SuperVector.new(vector)
       end
 
       def ubm_gaussian_weights
         # Returns a vector of gaussian weights, same dimension as speaker's super vectors
         @@ubm_gaussian_weights ||= begin
           ubm = Speaker.ubm
-          # weights = DoubleMatrix.new(1, ubm.supervector.dim)
-          weights = Array.new(ubm.supervector.dim, 0)
+          weights = GSL::Vector::alloc(ubm.supervector.dim)
           ubm.model.nb_of_components.times do |k|
             gaussian = ubm.model.components.get(k)
             gaussian.dim.times do |i|
               weights[k * gaussian.dim + i] = gaussian.weight
             end
           end
-          Vector.elements(weights)
+          weights
         end
       end
 
@@ -41,25 +40,19 @@ module Diarize
         # Returns a vector of diagonal covariances, same dimension as speaker's super vectors
         @@ubm_covariance ||= begin
           ubm = Speaker.ubm
-          # cov = DoubleMatrix.new(1, ubm.supervector.dim)
-          cov = Array.new(ubm.supervector.dim)
+          cov = GSL::Vector::alloc(ubm.supervector.dim)
           ubm.model.nb_of_components.times do |k|
             gaussian = ubm.model.components.get(k)
             gaussian.dim.times do |i|
               cov[k * gaussian.dim + i] = gaussian.getCovariance(i, i)
             end
           end
-          Vector.elements(cov)
+          cov
         end
       end
 
       def divergence(sv1, sv2)
-        # ubm_gaussian_weights.mul(((sv1.vector - sv2.vector) ** 2) / ubm_covariance).sum
-        diff   = sv1.vector - sv2.vector
-        square = diff.map {|el| el ** 2}
-        codiv  = Vector.elements(square.each.with_index.inject([]) {|a,(el,ix)| a << el / ubm_covariance[ix]})
-        mult   = ubm_gaussian_weights.each.with_index.inject([]) {|a,(el,ix)| a << el * codiv[ix]}
-        mult.inject(0, :+)
+        return ubm_gaussian_weights.mul(((sv1.vector - sv2.vector) ** 2) / ubm_covariance).sum
       end
 
     end # class
@@ -69,7 +62,7 @@ module Diarize
     end
 
     def hash
-      @vector.hash
+      @vector.to_a.hash
     end
 
     def to_a
@@ -77,4 +70,4 @@ module Diarize
     end
 
   end # SuperVector
-end
+end # Diarize

data/lib/diarize/version.rb

@@ -1,3 +1,3 @@
 module Diarize
-  VERSION = "0.3.12"
+  VERSION = "0.4.0"
 end

data/test/super_vector_test.rb

@@ -32,7 +32,8 @@ class SuperVectorTest < Test::Unit::TestCase
   def test_hash
     model = Diarize::Speaker.load_model(File.join(File.dirname(__FILE__), 'data', 'speaker1.gmm'))
     sv = Diarize::SuperVector.generate_from_model(model)
-    assert_equal sv.vector.hash, sv.hash
+    assert_equal (previous_hash = sv.vector.to_a.hash), sv.hash
+    assert_equal previous_hash, sv.hash
   end
 
   def test_to_a

data/test/version_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 class VersionTest < Test::Unit::TestCase
 
   def test_current_version
-    assert_equal "0.3.12", Diarize::VERSION
+    assert_equal "0.4.0", Diarize::VERSION
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diarize-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.4.0
 platform: ruby
 authors:
 - Yves Raimond
@@ -96,19 +96,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jblas-ruby
+  name: gsl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement