diarize-ruby 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0ca7dc41b19eb2fe4496e20cb87f260ebf52141
-  data.tar.gz: 85d3e9cda2554f69737ffb11fee7ff0b5e9b54e9
+  metadata.gz: 81c40e31baa740bf18b34d2de82bab3ae7897461
+  data.tar.gz: 3e987f962651badd8fc8a79d73a718d4660fe532
 SHA512:
-  metadata.gz: 219f481f7243ac904a35af383530b0308ddb0476afae76efcd954ac444112f9509080beabbd6797ff3e33266f48e75cce22af25385cf9170572d35c73d9feb61
-  data.tar.gz: 844543077abb226237e1e6ccdb28a3564a977360361686a820b00e190dd243f0545f8ee8313f25effaf192a4622e543482da561d78ade9567d331ad633515397
+  metadata.gz: c96801c0aa7dbf3409853fd519c18ce68ee291cb294f509ec642059152ac0d8cfc81936afe1b4c21d3ff4440b83e37c09594e36dddbe521e251697715653839f
+  data.tar.gz: a554a9ffc2de0f8f48aa198b7e11d3db639c49efbd941cad920f10453dc2c875ddd776a24c98685a14a3cac24f5890944efb947e1c143c1a8c81e63fada33587

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [v0.3.9] - 2016-11-29
+
+- Segment instances return speaker_id
+
 ## [v0.3.8] - 2016-11-29
 
 - Speaker#load_model to return Java object instead of Rjb wrapper

data/lib/diarize/segment.rb

@@ -2,15 +2,15 @@ module Diarize
   class Segment
     include ToRdf
 
-    attr_reader :start, :duration, :gender, :bandwidth
+    attr_reader :start, :duration, :speaker_gender, :bandwidth, :speaker_id
 
-    def initialize(audio, start, duration, gender, bandwidth, speaker_id)
+    def initialize(audio, start, duration, speaker_gender, bandwidth, speaker_id)
       @audio          = audio
       @start          = start
       @duration       = duration
       @bandwidth      = bandwidth
       @speaker_id     = speaker_id
-      @speaker_gender = gender
+      @speaker_gender = speaker_gender
     end
 
     def speaker
@@ -18,7 +18,7 @@ module Diarize
     end
 
     def namespaces
-      super.merge 'ws' => 'http://wsarchive.prototype0.net/ontology/'
+      super.merge({'ws' => 'http://wsarchive.prototype0.net/ontology/'})
     end
 
     def uri

data/lib/diarize/speaker.rb

@@ -160,7 +160,7 @@ module Diarize
         'ws:model' => model_uri,
         'ws:mean_log_likelihood' => mean_log_likelihood,
         'ws:supervector_hash' => supervector.hash.to_s,
-        'ws:supervector_sha' => supervector.sha
+        'ws:sha' => supervector.sha
       }
     end
 
@@ -170,7 +170,7 @@ module Diarize
         'model' => model_uri,
         'mean_log_likelihood' => mean_log_likelihood,
         'supervector_hash' => supervector.hash.to_s,
-        'supervector_sha' => supervector.sha
+        'sha' => supervector.sha
       }
     end
 
@@ -181,11 +181,8 @@ module Diarize
     protected
 
     def write_gmm(filename, model)
-      # gmmlist = java.util.ArrayList.new
       gmmlist = Rjb::JavaObjectWrapper.new("java.util.ArrayList")
-      # gmmlist << model.components
       gmmlist.java_object.add(model)
-      # output = fr.lium.spkDiarization.lib.IOFile.new(filename, 'wb')
       output = Rjb::import('fr.lium.spkDiarization.lib.IOFile').new(filename, 'wb')
       output.open
       Rjb::import('fr.lium.spkDiarization.libModel.ModelIO').writerGMMContainer(output, gmmlist.java_object)

data/lib/diarize/version.rb

@@ -1,3 +1,3 @@
 module Diarize
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/test/segment_test.rb

@@ -6,12 +6,21 @@ class SegmentTest < Test::Unit::TestCase
 
   def test_initialize
     segment = Diarize::Segment.new('audio', 'start', 'duration', 'gender', 'bandwidth', 'speaker_id')
-    assert_equal segment.instance_variable_get('@audio'), 'audio'
-    assert_equal segment.instance_variable_get('@start'), 'start'
-    assert_equal segment.instance_variable_get('@duration'), 'duration'
-    assert_equal segment.instance_variable_get('@speaker_gender'), 'gender'
-    assert_equal segment.instance_variable_get('@bandwidth'), 'bandwidth'
-    assert_equal segment.instance_variable_get('@speaker_id'), 'speaker_id'
+
+    # instance variables
+    assert_equal 'audio', segment.instance_variable_get('@audio')
+    assert_equal 'start', segment.instance_variable_get('@start')
+    assert_equal 'duration', segment.instance_variable_get('@duration')
+    assert_equal 'gender', segment.instance_variable_get('@speaker_gender')
+    assert_equal 'bandwidth', segment.instance_variable_get('@bandwidth')
+    assert_equal 'speaker_id', segment.instance_variable_get('@speaker_id')
+
+    # attr readers
+    assert_equal 'start', segment.start
+    assert_equal 'duration', segment.duration
+    assert_equal 'bandwidth', segment.bandwidth
+    assert_equal 'gender', segment.speaker_gender
+    assert_equal 'speaker_id', segment.speaker_id
   end
 
   def test_speaker

data/test/speaker_test.rb

@@ -106,6 +106,7 @@ class SpeakerTest < Test::Unit::TestCase
     assert_equal true, to_rdf.include?("ws:model")
     assert_equal true, to_rdf.include?("ws:mean_log_likelihood")
     assert_equal true, to_rdf.include?("ws:supervector_hash")
+    assert_equal true, to_rdf.include?("ws:sha")
     assert_equal true, to_rdf.include?("https://www.example.com/model/1")
   end
 
@@ -117,7 +118,7 @@ class SpeakerTest < Test::Unit::TestCase
     assert_equal true, as_json.has_key?('model')
     assert_equal true, as_json.has_key?('mean_log_likelihood')
     assert_equal true, as_json.has_key?('supervector_hash')
-    assert_equal true, as_json.has_key?('supervector_sha')
+    assert_equal true, as_json.has_key?('sha')
   end
 
   def test_to_json
@@ -129,6 +130,6 @@ class SpeakerTest < Test::Unit::TestCase
     assert_equal true, as_json.has_key?('model')
     assert_equal true, as_json.has_key?('mean_log_likelihood')
     assert_equal true, as_json.has_key?('supervector_hash')
-    assert_equal true, as_json.has_key?('supervector_sha')
+    assert_equal true, as_json.has_key?('sha')
   end
 end

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.8", Diarize::VERSION
+    assert_equal "0.3.9", Diarize::VERSION
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diarize-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.3.9
 platform: ruby
 authors:
 - Yves Raimond