noyes 0.9.2 → 1.0.0

data/lib/{c_impl → cext}/mel_filter.c

@@ -1,17 +1,15 @@
-#include "noyes.h"
-#include "rnoyes.h"
+#include "c_noyes.h"
+#include "r_noyes.h"
 #include "math.h"
 
-static int id_push;
-
 VALUE cMelFilter;
 
-static void mel_filter_free(void *p) {
-  free_mel_filter(p);
+static void _mel_filter_free(void *p) {
+  mel_filter_free(p);
 }
 
 static VALUE t_make_filter(VALUE self, VALUE(left), VALUE(center), VALUE(right), VALUE(init_freq), VALUE(delta)) {
-  NMatrix1 *d = make_filter(NUM2DBL(left), NUM2DBL(center),
+  Carr *d = make_filter(NUM2DBL(left), NUM2DBL(center),
                 NUM2DBL(right), NUM2DBL(init_freq), NUM2DBL(delta)); 
   if (d) {
     VALUE result = rb_ary_new2(2);
@@ -22,7 +20,7 @@ static VALUE t_make_filter(VALUE self, VALUE(left), VALUE(center), VALUE(right),
       rb_ary_store(filt, i-1, rb_float_new(d->data[i]));
     }
     rb_ary_store(result, 1, filt);
-    free_nmatrix1(d);
+    carr_free(d);
     return result;
   }
   return Qnil;
@@ -38,7 +36,7 @@ static VALUE t_to_linear(VALUE self, VALUE f) {
 
 static VALUE t_make_bank_parameters(VALUE self, VALUE srate, VALUE nfft,
                                     VALUE nfilt, VALUE lowerf, VALUE upperf) {
-  NMatrix *d = make_bank_parameters(NUM2INT(srate), NUM2INT(nfft),
+  Cmat *d = make_bank_parameters(NUM2INT(srate), NUM2INT(nfft),
                 NUM2INT(nfilt), NUM2INT(lowerf), NUM2INT(upperf)); 
   if (d) {
     VALUE result = rb_ary_new2(d->rows);
@@ -50,7 +48,7 @@ static VALUE t_make_bank_parameters(VALUE self, VALUE srate, VALUE nfft,
         rb_ary_store(row, j, rb_float_new(d->data[i][j]));
       }
     }
-    free_nmatrix(d);
+    cmat_free(d);
     return result;
   }
   return Qnil;
@@ -71,18 +69,19 @@ static VALUE t_init(VALUE self, VALUE args) {
     upperf = NUM2INT(rb_ary_entry(args, 4));
 
   MelFilter *s = new_mel_filter(srate, nfft, nfilt, lowerf, upperf);
-  VALUE mel_filter = Data_Wrap_Struct(cMelFilter, 0, mel_filter_free, s);
+  VALUE mel_filter = Data_Wrap_Struct(cMelFilter, 0, _mel_filter_free, s);
   rb_iv_set(self, "@mel_filter", mel_filter);
 
   return self;
 }
 
 static VALUE t_left_shift(VALUE self, VALUE obj) {
-  NMatrix *M = v_2_nmatrix(obj);
+  Cmat *M = r2cmat(obj);
   VALUE mel_filter = rb_iv_get(self, "@mel_filter");
   MelFilter *s;
   Data_Get_Struct(mel_filter, MelFilter, s);
-  NMatrix *d = mel_filter_apply(s, M);
+  Cmat *d = mel_filter_apply(s, M);
+  cmat_free(M);
 
   if (d) {
     VALUE result = rb_ary_new2(d->rows);
@@ -94,13 +93,12 @@ static VALUE t_left_shift(VALUE self, VALUE obj) {
         rb_ary_store(row, j, rb_float_new(d->data[i][j]));
       }
     }
-    free_nmatrix(d);
+    cmat_free(d);
     return result;
   }
   return Qnil;
 }
 
-
 void Init_mel_filter() {
   VALUE m_noyes_c = rb_define_module("NoyesC");
   cMelFilter = rb_define_class_under(m_noyes_c, "MelFilter", rb_cObject);
@@ -110,6 +108,4 @@ void Init_mel_filter() {
   rb_define_module_function(cMelFilter, "make_filter", t_make_filter, 5);
   rb_define_module_function(cMelFilter, "to_linear", t_to_linear, 1);
   rb_define_module_function(cMelFilter, "to_mel", t_to_mel, 1);
-  id_push = rb_intern("push");
 }
-

data/lib/cext/mfcc_16x8.c

@@ -0,0 +1,36 @@
+#include "ruby.h"
+#include "c_noyes.h"
+#include "r_noyes.h"
+
+VALUE cMfcc16x8;
+
+static void _mfcc_16x8_free(Mfcc16x8 *p) {
+  mfcc_16x8_free(p);
+}
+
+static VALUE t_init(VALUE self, VALUE args) {
+  Mfcc16x8 *s = mfcc_16x8_new();
+  VALUE mfcc_16x8 = Data_Wrap_Struct(cMfcc16x8, 0, _mfcc_16x8_free, s);
+  rb_iv_set(self, "@mfcc_16x8", mfcc_16x8);
+
+  return self;
+}
+
+static VALUE t_left_shift(VALUE self, VALUE obj) {
+  Carr *M = r2carr(obj);
+  VALUE mfcc_16x8 = rb_iv_get(self, "@mfcc_16x8");
+  Mfcc16x8 *s;
+  Data_Get_Struct(mfcc_16x8, Mfcc16x8, s);
+  Cmat *N = mfcc_16x8_apply(s, M);
+  VALUE result = cmat2r(N);
+  cmat_free(N);
+  carr_free(M);
+  return result;
+}
+
+void Init_mfcc_16x8() {
+  VALUE m_noyes_c = rb_define_module("NoyesC");
+  cMfcc16x8 = rb_define_class_under(m_noyes_c, "Mfcc16x8", rb_cObject);
+  rb_define_method(cMfcc16x8, "initialize", t_init, -2);
+  rb_define_method(cMfcc16x8, "<<", t_left_shift, 1);
+}

data/lib/{c_impl → cext}/power_spectrum.c

@@ -1,13 +1,11 @@
 #include "ruby.h"
-#include "noyes.h"
-#include "rnoyes.h"
-
-static int id_push;
+#include "c_noyes.h"
+#include "r_noyes.h"
 
 VALUE cPowerSpectrum;
 
-static void power_spectrum_free(void *p) {
-  free_power_spectrum(p);
+static void _power_spectrum_free(void *p) {
+  power_spectrum_free(p);
 }
 
 static VALUE t_init(VALUE self, VALUE args) {
@@ -17,19 +15,20 @@ static VALUE t_init(VALUE self, VALUE args) {
      nfft = NUM2INT(rb_ary_entry(args, 0));
   }
   PowerSpectrum *ps = new_power_spectrum(nfft);
-  VALUE psv = Data_Wrap_Struct(cPowerSpectrum, 0, power_spectrum_free, ps);
+  VALUE psv = Data_Wrap_Struct(cPowerSpectrum, 0, _power_spectrum_free, ps);
   rb_iv_set(self, "@ps", psv);
   return self;
 }
 
 static VALUE t_left_shift(VALUE self, VALUE obj) {
-  NMatrix *M = v_2_nmatrix(obj);
+  Cmat *M = r2cmat(obj);
   PowerSpectrum *ps;
   VALUE psv = rb_iv_get(self, "@ps");
   Data_Get_Struct(psv, PowerSpectrum, ps);
-  NMatrix *N = power_spectrum_apply(ps, M);
-  VALUE result = nmatrix_2_v(N);
-  free_nmatrix(N);
+  Cmat *N = power_spectrum_apply(ps, M);
+  VALUE result = cmat2r(N);
+  cmat_free(N);
+  cmat_free(M);
   return result;
 }
 
@@ -38,5 +37,4 @@ void Init_power_spectrum() {
   cPowerSpectrum = rb_define_class_under(m_noyes_c, "PowerSpectrumFilter", rb_cObject);
   rb_define_method(cPowerSpectrum, "initialize", t_init, -2);
   rb_define_method(cPowerSpectrum, "<<", t_left_shift, 1);
-  id_push = rb_intern("push");
 }

data/lib/{c_impl → cext}/preemphasis.c

@@ -1,13 +1,11 @@
 #include "ruby.h"
-#include "noyes.h"
-#include "rnoyes.h"
-
-static int id_push;
+#include "c_noyes.h"
+#include "r_noyes.h"
 
 VALUE cPreemphasizer;
 
-static void preemphasizer_free(void *p) {
-  free_preemphasizer(p);
+static void _preemphasizer_free(void *p) {
+  preemphasizer_free(p);
 }
 
 static VALUE t_init(VALUE self, VALUE args) {
@@ -17,20 +15,20 @@ static VALUE t_init(VALUE self, VALUE args) {
      factor = NUM2DBL(rb_ary_entry(args, 0));
   }
   Preemphasizer *pre = new_preemphasizer(factor);
-  VALUE prev = Data_Wrap_Struct(cPreemphasizer, 0, preemphasizer_free, pre);
+  VALUE prev = Data_Wrap_Struct(cPreemphasizer, 0, _preemphasizer_free, pre);
   rb_iv_set(self, "@preemphasizer", prev);
   return self;
 }
 
 static VALUE t_left_shift(VALUE self, VALUE obj) {
-  NMatrix1 *M = v_2_nmatrix1(obj);
+  Carr *M = r2carr(obj);
   Preemphasizer *pre;
   VALUE prev = rb_iv_get(self, "@preemphasizer");
   Data_Get_Struct(prev, Preemphasizer, pre);
-  NMatrix1 *N = preemphasizer_apply(pre, M);
-  VALUE result = nmatrix1_2_v(N);
-  free_nmatrix1(N);
-  free_nmatrix1(M);
+  Carr *N = preemphasizer_apply(pre, M);
+  VALUE result = carr2r(N);
+  carr_free(N);
+  carr_free(M);
   return result;
 }
 
@@ -39,5 +37,4 @@ void Init_preemphasis() {
   cPreemphasizer = rb_define_class_under(m_noyes_c, "Preemphasizer", rb_cObject);
   rb_define_method(cPreemphasizer, "initialize", t_init, -2);
   rb_define_method(cPreemphasizer, "<<", t_left_shift, 1);
-  id_push = rb_intern("push");
 }

data/lib/{c_impl/noyes_c.c → cext/r_noyes.c}

@@ -1,9 +1,9 @@
-#include "noyes.h"
-#include "rnoyes.h"
+#include "c_noyes.h"
+#include "r_noyes.h"
 
 // Wrappers for matrix class
-NMatrix * v_2_nmatrix(VALUE value) {
-  NMatrix *M = NULL;
+Cmat * r2cmat(VALUE value) {
+  Cmat *M = NULL;
   int rows = RARRAY_LEN(value);
   int cols = 0;
   if (rows > 0) {
@@ -13,7 +13,7 @@ NMatrix * v_2_nmatrix(VALUE value) {
       rb_raise(rb_eTypeError, "Matrix one dimensional instead of two");
     }
     cols = RARRAY_LEN(colzero);
-    M = new_nmatrix(rows,cols);
+    M = cmat_new(rows,cols);
      int i,j;
      for (i=0;i<rows;++i) {
        VALUE col = rb_ary_entry(value, i);
@@ -25,7 +25,7 @@ NMatrix * v_2_nmatrix(VALUE value) {
   return M;
 }
 
-VALUE nmatrix_2_v(NMatrix *M) {
+VALUE cmat2r(Cmat *M) {
   VALUE v = Qnil;
   if (M) {
     v = rb_ary_new2(M->rows);
@@ -42,8 +42,8 @@ VALUE nmatrix_2_v(NMatrix *M) {
   return v;
 }
 
-NMatrix1 * v_2_nmatrix1(VALUE value) {
-  NMatrix1 *M = NULL;
+Carr * r2carr(VALUE value) {
+  Carr *M = NULL;
   int rows = RARRAY_LEN(value);
   if (rows > 0) {
     VALUE colzero = rb_ary_entry(value, 0);
@@ -51,7 +51,7 @@ NMatrix1 * v_2_nmatrix1(VALUE value) {
     if (!NIL_P(colzero)) {
       rb_raise(rb_eTypeError, "Matrix two dimensional instead of one");
     }
-    M = new_nmatrix1(rows);
+    M = carr_new(rows);
      int i;
      for (i=0;i<rows;++i) {
        VALUE val = rb_ary_entry(value, i);
@@ -61,7 +61,7 @@ NMatrix1 * v_2_nmatrix1(VALUE value) {
   return M;
 }
 
-VALUE nmatrix1_2_v(NMatrix1 *M) {
+VALUE carr2r(Carr *M) {
   VALUE v = Qnil;
   if (M) {
     v = rb_ary_new2(M->rows);
@@ -83,9 +83,9 @@ void Init_noyes_c() {
   Init_mel_filter();
   Init_log_compressor();
   Init_live_cmn();
-  Init_fast_8k_mfcc();
+  Init_mfcc_16x8();
   Init_dct();
   Init_bent_cent_marker();
   Init_speech_trimmer();
-  Init_n_list();
+  Init_clist();
 }

data/lib/{c_impl/rnoyes.h → cext/r_noyes.h}

@@ -7,14 +7,14 @@ void Init_power_spectrum();
 void Init_mel_filter();
 void Init_log_compressor();
 void Init_live_cmn();
-void Init_fast_8k_mfcc();
+void Init_mfcc_16x8();
 void Init_dct();
 void Init_bent_cent_marker();
 void Init_speech_trimmer();
-void Init_n_list();
+void Init_clist();
 
-VALUE nmatrix_2_v(NMatrix *d);
-NMatrix * v_2_nmatrix(VALUE value);
+VALUE cmat2r(Cmat *d);
+Cmat * r2cmat(VALUE value);
 
-VALUE nmatrix1_2_v(NMatrix1 *d);
-NMatrix1 * v_2_nmatrix1(VALUE value);
+VALUE carr2r(Carr *d);
+Carr * r2carr(VALUE value);

data/lib/{c_impl → cext}/segmenter.c

@@ -1,13 +1,11 @@
 #include "ruby.h"
-#include "noyes.h"
-#include "rnoyes.h"
-
-static int id_push;
+#include "c_noyes.h"
+#include "r_noyes.h"
 
 VALUE cSegmenter;
 
-static void segmenter_free(void *p) {
-  free_segmenter(p);
+static void _segmenter_free(void *p) {
+  segmenter_free(p);
 }
 static VALUE t_init(VALUE self, VALUE args) {
   int winsz = 205;
@@ -21,21 +19,21 @@ static VALUE t_init(VALUE self, VALUE args) {
   }
 
   Segmenter *s = new_segmenter(winsz, winshift);
-  VALUE segmenter = Data_Wrap_Struct(cSegmenter, 0, segmenter_free, s);
+  VALUE segmenter = Data_Wrap_Struct(cSegmenter, 0, _segmenter_free, s);
   rb_iv_set(self, "@segmenter", segmenter);
 
   return self;
 }
 
 static VALUE t_left_shift(VALUE self, VALUE obj) {
-  NMatrix1 *M = v_2_nmatrix1(obj); 
+  Carr *M = r2carr(obj); 
   VALUE segmenter = rb_iv_get(self, "@segmenter");
   Segmenter *s;
   Data_Get_Struct(segmenter, Segmenter, s);
-  NMatrix *N = segmenter_apply(s, M);
-  VALUE result = nmatrix_2_v(N);
-  free_nmatrix(N);
-  free_nmatrix1(M);
+  Cmat *N = segmenter_apply(s, M);
+  VALUE result = cmat2r(N);
+  cmat_free(N);
+  carr_free(M);
   return result;
 }
 
@@ -44,5 +42,4 @@ void Init_segmenter() {
   cSegmenter = rb_define_class_under(m_noyes_c, "Segmenter", rb_cObject);
   rb_define_method(cSegmenter, "initialize", t_init, -2);
   rb_define_method(cSegmenter, "<<", t_left_shift, 1);
-  id_push = rb_intern("push");
 }

data/lib/{c_impl → cext}/speech_trimmer.c

@@ -1,30 +1,31 @@
 #include "ruby.h"
-#include "noyes.h"
-#include "rnoyes.h"
-
-static int id_push;
+#include "c_noyes.h"
+#include "r_noyes.h"
 
 VALUE cSpeechTrimmer;
 
-static void speech_trimmer_free(void *p) {
-  free_speech_trimmer(p);
+static void _speech_trimmer_free(void *p) {
+  speech_trimmer_free(p);
 }
 
 static VALUE t_init(VALUE self, VALUE args) {
   int len = RARRAY_LEN(args);
   SpeechTrimmer *st;
-  if (len == 1)
-    st = new_speech_trimmer(NUM2INT(rb_ary_entry(args, 0)));
-  else
-    st = new_speech_trimmer(16000);
+  int frequency = 16000;
+  double threshold = 10;
+  if (len > 0)
+    frequency = NUM2INT(rb_ary_entry(args, 0));
+  if (len > 1)
+    frequency = rb_float_new(rb_ary_entry(args, 0));
 
-  VALUE stv = Data_Wrap_Struct(cSpeechTrimmer, 0, speech_trimmer_free, st);
+  st = new_speech_trimmer(frequency, threshold);
+  VALUE stv = Data_Wrap_Struct(cSpeechTrimmer, 0, _speech_trimmer_free, st);
   rb_iv_set(self, "@speech_trimmer", stv);
   return self;
 }
 
 static VALUE t_enqueue(VALUE self, VALUE obj) {
-  NMatrix1 *M = v_2_nmatrix1(obj);
+  Carr *M = r2carr(obj);
   SpeechTrimmer *st;
   Data_Get_Struct(rb_iv_get(self, "@speech_trimmer"), SpeechTrimmer, st);
   speech_trimmer_enqueue(st, M);
@@ -34,9 +35,9 @@ static VALUE t_enqueue(VALUE self, VALUE obj) {
 static VALUE t_dequeue(VALUE self) {
   SpeechTrimmer *st;
   Data_Get_Struct(rb_iv_get(self, "@speech_trimmer"), SpeechTrimmer, st);
-  NMatrix1 *N =speech_trimmer_dequeue(st);
-  VALUE result = nmatrix1_2_v(N);
-  free_nmatrix1(N);
+  Carr *N =speech_trimmer_dequeue(st);
+  VALUE result = carr2r(N);
+  carr_free(N);
   return result;
 }
 
@@ -48,17 +49,17 @@ static VALUE t_eos(VALUE self) {
 }
 
 static VALUE t_left_shift(VALUE self, VALUE obj) {
-  NMatrix1 *M  = v_2_nmatrix1(obj);
+  Carr *M  = r2carr(obj);
   SpeechTrimmer *st;
   Data_Get_Struct(rb_iv_get(self, "@speech_trimmer"), SpeechTrimmer, st);
-  NMatrix *R = speech_trimmer_apply(st, M);
-  if (!R) {
-    free_nmatrix1(M);
+  Cmat *R = speech_trimmer_apply(st, M);
+  if (R == NULL) {
+    carr_free(M);
     return Qnil;
   }
-  VALUE result = nmatrix_2_v(R);
-  free_nmatrix1(M);
-  free_nmatrix(R);
+  VALUE result = cmat2r(R);
+  carr_free(M);
+  cmat_free(R);
   return result;
 }
 
@@ -70,5 +71,4 @@ void Init_speech_trimmer() {
   rb_define_method(cSpeechTrimmer, "dequeue", t_dequeue, 0);
   rb_define_method(cSpeechTrimmer, "eos?", t_eos, 0);
   rb_define_method(cSpeechTrimmer, "<<", t_left_shift, 1);
-  id_push = rb_intern("push");
 }

data/lib/common/noyes_dsl.rb

@@ -59,4 +59,7 @@ module Noyes
   class Segmenter
     include NoyesFilterDSL
   end
+  class Compression
+    include NoyesFilterDSL
+  end
 end

data/lib/common/ruby_ext.rb

@@ -17,3 +17,12 @@ module CMath
     a < b ? a : b
   end
 end
+
+# log2 apparently exists in ruby 1.9.x, but not ruby 1.8.x
+if !Math.respond_to? :log2
+  module Math
+    def Math.log2 n
+      log(n)/log(2)
+    end
+  end
+end

data/lib/noyes.rb

@@ -10,5 +10,18 @@ require 'ruby_impl/discrete_fourier_transform'
 require 'ruby_impl/power_spec'
 require 'ruby_impl/preemphasis'
 require 'ruby_impl/segment'
+require 'ruby_impl/compression'
 require 'ruby_impl/bent_cent_marker'
 require 'ruby_impl/speech_trimmer'
+
+# The Noyes module encapsulates all pure Ruby implemenations of the Noyes
+# library.  At present there is also an equivalent NoyesC and NoyesJava modules
+# that encapsulate C and Java implementations, respectively.  This, it is
+# possible to choose an implementation programmatically simply by choosing a
+# module.  It is even possible to mix and match components with different
+# implementations.  The only limitation on this is that Java implementations
+# only work under JRuby and C implementation only work under everything else.
+# So C and Java implementations cannot be used at the same time.  That's a
+# limitation of the current Ruby interpreters, not the Noyes library.
+module Noyes
+end

data/lib/noyes_c.rb

@@ -1,2 +1,24 @@
 require "common"
-require "c_impl/noyes_c"
+require "cext/noyes_c"
+
+# The NoyesC module encapsulates the C implementation of the Noyes library.
+# Functionally, it is identical to the Noyes and NoyesJava modules.  The NoyesC
+# implementation is composed of Ruby bindings, which are written in C and the
+# core C routines.  The core C routines are not dependent on the Ruby wrappers
+# or any Ruby libraries.  They can be compiled into pure C implementations
+# without modification.  The underlying pure C implementation files can be
+# identified by the 'c_' prefix.
+#
+# The underlying C implementation closely parallels the Noyes API.  For
+# example, the following Ruby and C code are identical.
+#
+#
+#     pre = NoyesC::Preemphasizer.new 0.97
+#     preemphasized_data = pre << data
+#
+#
+#     Preemphasizer *pre = preemphasizer_new(0.97);
+#     Carr * preemphasized_data = preemphasizer_apply(data);
+#
+module Noyes
+end

data/lib/noyes_java.rb

@@ -14,3 +14,8 @@ require 'java_impl/segment'
 require 'java_impl/bent_cent_marker'
 require 'java_impl/speech_trimmer'
 require 'noyes.jar'
+
+# The NoyesJava module encapsulates the Java implementation of the Noyes
+# library.  It is otherwise identical to the Noyes and NoyesC modules.
+module NoyesJava
+end