diarize-ruby 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6538efc1cab1c18e656dcc50c1e2b57d8f9f38a7
-  data.tar.gz: d86715c3e757994d859c9847e013c5501895a5f1
+  metadata.gz: 862081b1f139a2d177181be622086de18018aabd
+  data.tar.gz: 9f10cbcc0741b6ad845b2d5df000420e71aa4807
 SHA512:
-  metadata.gz: 0762b0b955406e9c43b95e44331f518379c90a3403addcb8478bdae93746095ed060805f4e128bfd3a7640118ba821b506e467d99b3dfe3679922056eeaafac4
-  data.tar.gz: 0a38dcab217b7b45595d734434be3ffbdf9755c7d869bb93a49198b288b45b59d2dcdb078213d2626fc67d70bb7d955b0eeaf5982a7cb3482ea647aa9af5328d
+  metadata.gz: 6543825ebf8a9909e3d49bfa81afd8f7146b426fd5bbf54fa1c3bc5561433625f384678c077bd63ecaa90baedd783aec2c2e3a1a09c372ee6d92827f36f7b6bc
+  data.tar.gz: 52f7db8c0bb30e16a13f61de11bc55ad43c26f7e3d2670a68889cd798c149d621dfa5e2e0260dacb89fe96a6e100e983b3e7a4893bcc84579fa3cd6f1a7bb643

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [v0.3.11] - 2016-11-30
+
+- Add `Segment#as_json` and `Segment#to_json`
+- Raise error when saving normalized model without force=true
+
+## [v0.3.10] - 2016-11-30
+
+- Remove `SuperVector#sha`
+- SuperVector initialize from arrays
+
 ## [v0.3.9] - 2016-11-29
 
 - Segment instances return speaker_id

data/lib/diarize/segment.rb

@@ -34,10 +34,26 @@ module Diarize
       {
         'ws:start' => start,
         'ws:duration' => duration,
-        'ws:gender' => gender,
+        'ws:gender' => speaker_gender,
         'ws:bandwidth' => bandwidth,
         'ws:speaker' => speaker,
       }
     end
+
+    def as_json
+      {
+        'start' => start,
+        'duration' => duration,
+        'gender' => speaker_gender,
+        'bandwidth' => bandwidth,
+        'speaker_id' => speaker_id
+      }.tap {|s|
+        s['speaker'] = speaker.as_json if speaker
+      }
+    end
+
+    def to_json
+      as_json.to_json
+    end
   end
 end

data/lib/diarize/speaker.rb

@@ -94,8 +94,8 @@ module Diarize
       @mean_log_likelihood = mll
     end
 
-    def save_model(filename)
-      # TODO perhaps a warning if a normalized model is being saved?
+    def save_model(filename, force = false)
+      raise RuntimeError, "normalized model must be saved with force=true" if !force && normalized?
       write_gmm(filename, @model)
     end
 

data/lib/diarize/version.rb

@@ -1,3 +1,3 @@
 module Diarize
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

data/test/segment_test.rb

@@ -35,4 +35,24 @@ class SegmentTest < Test::Unit::TestCase
     assert_equal segment.uri, URI('http://example.com#t=2,7')
   end
 
+  def test_as_json
+    segment    = Diarize::Segment.new(OpenStruct.new({:base_uri => 'http://example.com'}), 2, 5, 'm', nil, 's1')
+    model_file = File.join(File.dirname(__FILE__), 'data', 'speaker1.gmm')
+    speaker    = Diarize::Speaker.new(URI.parse(""), "F", model_file)
+    speaker.mean_log_likelihood = 0.9
+    segment.expects(:speaker).returns(speaker).twice
+    as_json = segment.as_json
+    assert_equal true, as_json.has_key?('start')
+    assert_equal true, as_json.has_key?('duration')
+    assert_equal true, as_json.has_key?('gender')
+    assert_equal true, as_json.has_key?('bandwidth')
+    assert_equal true, as_json.has_key?('speaker_id')
+    assert_equal true, as_json.has_key?('speaker')
+
+    assert_equal true, as_json['speaker'].has_key?('gender')
+    assert_equal true, as_json['speaker'].has_key?('model')
+    assert_equal true, as_json['speaker'].has_key?('mean_log_likelihood')
+    assert_equal true, as_json['speaker'].has_key?('supervector_hash')
+  end
+
 end

data/test/speaker_test.rb

@@ -53,12 +53,42 @@ class SpeakerTest < Test::Unit::TestCase
   def test_save_and_load_model
     speaker = Diarize::Speaker.ubm
     tmp = Tempfile.new(['diarize-test', '.gmm'])
-    speaker.save_model(tmp.path)
+    speaker.save_model(tmp.path, true)
     model = Diarize::Speaker.load_model(tmp.path)
     assert_equal speaker.model.components.get(0).mean(0), model.components.get(0).mean(0)
     File.delete(tmp.path)
   end
 
+  def test_should_raise_error_when_saving_normalized_model_without_force
+    speaker = Diarize::Speaker.new(nil, nil, File.join(File.dirname(__FILE__), 'data', 'speaker1.gmm'))
+    tmp = Tempfile.new(['diarize-test', '.gmm'])
+
+    # not normalized, forced false
+    assert_nothing_raised {
+      speaker.save_model(tmp.path)
+      File.delete(tmp.path)
+    }
+
+    # not normalized, forced true
+    assert_nothing_raised {
+      speaker.save_model(tmp.path, true)
+      File.delete(tmp.path)
+    }
+
+    # normalized, forced false
+    assert_raise {
+      speaker.normalize!
+      speaker.save_model(tmp.path, false)
+    }
+
+    # normalized, forced true
+    assert_nothing_raised {
+      speaker.normalize!
+      speaker.save_model(tmp.path, true)
+      File.delete(tmp.path)
+    }
+  end
+
   def test_divergence_returns_nil_if_one_model_is_empty
     speaker1 = Diarize::Speaker.ubm
     speaker2 = Diarize::Speaker.ubm

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

metadata

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