plant-sirens 0.2.0 → 0.3.0

data/README.markdown

@@ -1,5 +1,5 @@
 # sirens-ruby
-sirens-ruby is a ruby extension for [Sirens](http://github.com/plant/sirens), a library for segmentation, indexing, and retrieval of environmental and natural sounds. Sirens is currently under development and only supports basic feature extraction. Please check back for updates.
+sirens-ruby is a ruby extension for [Sirens](http://github.com/plant/sirens), a library for segmentation, indexing, and retrieval of environmental and natural sounds. Sirens is currently under development and is only ready to use for feature extraction and segmentation. Please check back for updates on retrieval and indexing.
 
 ## Requirements
 To install sirens-ruby, it is necessary to have these two libraries:
@@ -46,28 +46,7 @@ After installing Rice from source, if you have not installed it as a gem, you ma
 If you have any problems with this process, please [submit an issue](http://github.com/plant/sirens-ruby/issues) and I'll try to help as soon as possible.
 
 ## Usage
-Sirens is pretty minimal at the moment and only supports the extraction of six basic features. In the future, Sirens will include feature-based segmentation and comparison.
-
-Here is a basic example to extract loudness (dB) from a sound file:
-	
-	require 'sirens'
-	include Sirens
-	
-	s = Sound.new
-  	s.frameLength = 0.04
-  	s.hopLength = 0.02
-  	
-	s.open('sound.wav')
-	
-	loudness = Loudness.new
-	loudness.historySize = s.frames
-	
-	s.sampleFeatures = [loudness]
-	s.extractFeatures
-	
-	puts loudness.history
-
-More examples can be found in the /examples folder. Detailed documentation is on the [Wiki](http://wiki.github.com/plant/sirens-ruby). Expect RDoc documentation soon.
+RDoc documentation and a full tutorial is to come, but for now, you can check out some example code in the examples/ directory to get an idea of how the extension works.
 
 # Copyright
-Copyright (c) 2009 Brandon Mechtley. See LICENSE for details.
+Copyright 2009 Brandon Mechtley. Sirens-ruby is licensed under the [MIT License](http://creativecommons.org/licenses/MIT/). See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/ext/sirens/sirens.cpp

@@ -100,6 +100,26 @@ vector<Feature*> from_ruby<vector<Feature*> >(Object x) {
 	return y;
 }
 
+// 1D int vector
+template <>
+Object to_ruby<vector<int> >(vector<int> const & x) {
+	return Array(x.begin(), x.end());
+}
+
+template <>
+vector<int> from_ruby<vector<int> >(Object x) {
+	vector<int> values;
+	
+	Array ruby_vector(x);
+	
+	for (unsigned int i = 0; i < ruby_vector.size(); i++) {
+		double* value = (double*)(ruby_vector[i].value());
+		values.push_back((int)(*value));
+	}
+	
+	return values;
+}
+
 // 2D double vector
 template <>
 Object to_ruby<vector<double> >(vector<double> const & x) {
@@ -204,8 +224,8 @@ extern "C" void Init_sirens() {
 		.define_method("pNew=", &Segmenter::setPNew)
 		.define_method("pOff", &Segmenter::getPOff)
 		.define_method("pOff=", &Segmenter::setPOff)
-		.define_method("beams", &Segmenter::getBeams)
-		.define_method("beams=", &Segmenter::setBeams)
+		.define_method("segments", &Segmenter::getSegments)
+		.define_method("modes", &Segmenter::getModes)
 		.define_method("segment", &Segmenter::getSegments);
 		
 	/* 	

data/sirens.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sirens}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Mechtley"]
-  s.date = %q{2009-08-24}
+  s.date = %q{2009-08-25}
   s.description = %q{Ruby gem that implements Sirens, a library for segmentation, indexing, and retrieval of environmental and natural sounds.}
   s.email = %q{bmechtley+github@gmail.com}
   s.extensions = ["ext/sirens/extconf.rb"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: plant-sirens
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Brandon Mechtley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-24 00:00:00 -07:00
+date: 2009-08-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency