plant-sirens 0.1.1 → 0.2.0

data/README.markdown

@@ -5,6 +5,7 @@ sirens-ruby is a ruby extension for [Sirens](http://github.com/plant/sirens), a
 To install sirens-ruby, it is necessary to have these two libraries:
 
 1. [FFTW](http://www.fftw.org/download.html)
+2. [libsndfile](http://www.mega-nerd.com/libsndfile/)
 2. [Sirens](http://github.com/plant/sirens)
 
 Additionally, sirens-ruby has the following gem dependencies, which RubyGems should take care of:
@@ -13,14 +14,37 @@ Additionally, sirens-ruby has the following gem dependencies, which RubyGems sho
 2. [jeweler](http://github.com/technicalpickles/jeweler/)
 2. [rice](http://github.com/cout/rice/) 
 
-*Rice Note:* I've had some problems with installing the Rice 1.1.0 gem. Try 1.0.2 if it doesn't work. On OSX, [neither seems to work](http://rubyforge.org/tracker/index.php?func=detail&aid=19828&group_id=4163&atid=16066), so try the [workaround on the Wiki](http://wiki.github.com/plant/sirens-ruby/installing-rice-on-osx).
-
 ## Installation
 To install sirens-ruby, type:
 
 	gem sources -a http://gems.github.com
 	sudo gem install plant-sirens
 
+If you are using OSX, [Rice has some issues with building in some environments](http://rubyforge.org/tracker/index.php?func=detail&aid=19828&group_id=4163&atid=16066). To fix this, you need to specify which architecture (Intel or PowerPC) to use when you install the gem, e.g.:
+
+	sudo bash
+	ARCHFLAGS="-arch i386" gem install plant-sirens -- --build-flags
+
+replacing `i386` with `ppc` if you are using a PowerPC machine.
+
+### Local installation
+If you do not have root access, you may have some problems, as the Rice gem uses a nonstandard installation procedure that attempts to install the library in a path outside where the gem is installed. There may be an easier workaround for this by passing some options to rubygems, but the only solution I've found so far is to [install Rice manually from source](http://rice.rubyforge.org/) before installing sirens-ruby. If you are installing on OSX, please see [this ticket](http://rubyforge.org/tracker/index.php?func=detail&aid=19828&group_id=4163&atid=16066) for tips on installing from source. 
+
+FFTW and libsndfile can both be installed locally by changing the prefix path in their configure steps, e.g.
+
+	./configure --prefix=$HOME/local
+
+Sirens can be installed similarly:
+
+	scons install --prefix=$HOME/local
+
+
+After installing Rice from source, if you have not installed it as a gem, you may have troubles with gem dependencies when installing sirens-ruby. To get around this, you can ignore gem dependencies:
+
+	gem --ignore-dependencies install plant-sirens
+	
+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.
 

data/Rakefile

@@ -22,27 +22,27 @@ end
 require 'rake/extensiontask'
 Rake::ExtensionTask.new('sirens', spec.gemspec)
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/*_test.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :default => :test
+#require 'rake/testtask'
+#Rake::TestTask.new(:test) do |test|
+#  test.libs << 'lib' << 'test'
+#  test.pattern = 'test/**/*_test.rb'
+#  test.verbose = true
+#end
+
+#begin
+#  require 'rcov/rcovtask'
+#  Rcov::RcovTask.new do |test|
+#    test.libs << 'test'
+#    test.pattern = 'test/**/*_test.rb'
+#    test.verbose = true
+#  end
+#rescue LoadError
+#  task :rcov do
+#    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
+#  end
+#end
+
+#task :default => :test
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/examples/segmentation.rb

@@ -0,0 +1,88 @@
+require 'rubygems'
+require 'sirens'
+include Sirens
+
+# Open sound.
+s = Sound.new
+s.frameLength = 0.04
+s.hopLength = 0.02
+s.open('sound.wav')
+
+# Initialize features.
+l = Loudness.new
+l.maxHistorySize = s.frames
+l.max = 0
+l.min = -60
+l.segmentationParameters.alpha = 0.15
+l.segmentationParameters.r = 0.0098
+l.segmentationParameters.cStayOff = 0.0015
+l.segmentationParameters.cTurnOn = 0.085
+l.segmentationParameters.cTurningOn = 0.085
+l.segmentationParameters.cTurnOff = 0.085
+l.segmentationParameters.cNewSegment = 0.085
+l.segmentationParameters.cStayOn = 0.05
+l.segmentationParameters.pLagPlus = 0.75
+l.segmentationParameters.pLagMinus = 0.75
+
+sc = SpectralCentroid.new
+sc.maxHistorySize = s.frames
+sc.max = 25.7848
+sc.min = 0.4994
+sc.spectrumSize = s.spectrumSize
+sc.sampleRate = s.sampleRate
+sc.segmentationParameters.alpha = 0.05
+sc.segmentationParameters.r = 0.00000196
+sc.segmentationParameters.cStayOff = 0.0000933506
+sc.segmentationParameters.cTurnOn = 0.85
+sc.segmentationParameters.cTurningOn = 0.85
+sc.segmentationParameters.cTurnOff = 0.85
+sc.segmentationParameters.cNewSegment = 0.85
+sc.segmentationParameters.cStayOn = 0.0025296018
+sc.segmentationParameters.pLagPlus = 0.75
+sc.segmentationParameters.pLagMinus = 0.075
+
+ss = SpectralSparsity.new
+ss.maxHistorySize = s.frames
+ss.max = 0.6509
+ss.min = 1.0 / 1024.0
+ss.segmentationParameters.alpha = 0.05
+ss.segmentationParameters.r = 0.0196
+ss.segmentationParameters.cStayOff = 0.001833506
+ss.segmentationParameters.cTurnOn = 0.85
+ss.segmentationParameters.cTurningOn = 0.85
+ss.segmentationParameters.cTurnOff = 0.85
+ss.segmentationParameters.cNewSegment = 0.85
+ss.segmentationParameters.cStayOn = 0.009296018
+ss.segmentationParameters.pLagPlus = 0.75
+ss.segmentationParameters.pLagMinus = 0.75
+
+features = FeatureSet.new
+features.sampleFeatures = [l]
+features.spectralFeatures =[sc, ss]
+
+# Extract features.
+before = Time.now
+
+s.features = features
+s.extractFeatures
+s.close
+
+elapsed = Time.now - before
+puts "Feature extraction took #{elapsed} seconds."
+
+# Segment sound.
+segmenter = Segmenter.new
+segmenter.pNew = 0.00000000001
+segmenter.pOff = 0.00000000001
+segmenter.beams = 20
+
+before = Time.now
+
+segments = segmenter.segment(features)
+
+elapsed = Time.now - before
+puts "Segmentation took #{elapsed} seconds."
+
+segments.each do |start, duration|
+  puts "%d-%d" % [start, start + duration]
+end

data/ext/sirens/extconf.rb

@@ -12,10 +12,11 @@ require 'mkmf-rice'
 
 $CPPFLAGS << " #{ENV['CPPFLAGS']}"
 $LDFLAGS << " #{ENV['LDFLAGS']}"
-$CFLAGS << " #{ENV['CFLAGS']} -D__OS_MACOSX__"
+$CFLAGS << " #{ENV['CFLAGS']}"
 
 have_library('c')
 have_library('stdc++')
+have_library('sndfile')
 have_library('sirens')
 have_library('fftw3')
 

data/ext/sirens/sirens.cpp

@@ -5,26 +5,84 @@
 #include "rice/Constructor.hpp"
 using namespace Rice;
 
-#include "sirens/Sound.h"
-#include "sirens/CircularArray.h"
-#include "sirens/features/Loudness.h"
-#include "sirens/features/Harmonicity.h"
-#include "sirens/features/TransientIndex.h"
-#include "sirens/features/SpectralCentroid.h"
-#include "sirens/features/SpectralSparsity.h"
-#include "sirens/features/TemporalSparsity.h"
+#include "sirens/Sirens.h"
 using namespace Sirens;
 
+/*---------------------*
+ * Rice class wrappers *
+ *---------------------*/
+
+// All of this is just so that we can wrap getSegmentationParameters() to avoid putting the returned pointer in the garbage collector. 
+// Rice requires that we wrap every descendent of Feature. For whatever reason, it won't support things like 
+// &SpectralCentroid::getSampleRate (the parent classº in the class definition for RiceSpectralCentroid, so it's necessary to provide
+// delegate functions for every parameter.
+
+class RiceFeature : public Feature {
+public:
+	Object getRiceSegmentationParameters() {
+		return Rice::Data_Object<SegmentationParameters>(getSegmentationParameters(), Rice::Data_Type<SegmentationParameters>::klass(), 0, 0);
+	}
+};
+
+class RiceLoudness : public Loudness, public RiceFeature {};
+class RiceSpectralSparsity : public SpectralSparsity, public RiceFeature {};
+class RiceTemporalSparsity : public TemporalSparsity, public RiceFeature {};
+class RiceSpectralCentroid : public SpectralCentroid, public RiceFeature {
+public:
+	void setSpectrumSize(int value) {SpectralCentroid::setSpectrumSize(value);}
+	void setSampleRate(int value) {SpectralCentroid::setSampleRate(value);}
+	int getSpectrumSize() {return SpectralCentroid::getSpectrumSize();}
+	int getSampleRate() {return SpectralCentroid::getSpectrumSize();}
+};
+
+class RiceTransientIndex : public TransientIndex, public RiceFeature {
+public:
+	void setSpectrumSize(int value) {TransientIndex::setSpectrumSize(value);}
+	void setSampleRate(int value) {TransientIndex::setSampleRate(value);}
+	void setMels(int value) {TransientIndex::setMels(value);}
+	void setFilters(int value) {TransientIndex::setFilters(value);}
+	int getSpectrumSize() {return TransientIndex::getSpectrumSize();}
+	int getSampleRate() {return TransientIndex::getSpectrumSize();}
+	int getMels() {return TransientIndex::getMels();}
+	int getFilters() {return TransientIndex::getFilters();}
+};
+
+class RiceHarmonicity : public Harmonicity, public RiceFeature {
+public:
+	void setSpectrumSize(int value) {Harmonicity::setSpectrumSize(value);}
+	void setSampleRate(int value) {Harmonicity::setSampleRate(value);}
+	void setSearchRegionLength(int value) {Harmonicity::setSearchRegionLength(value);}
+	void setAbsThreshold(double value) {Harmonicity::setAbsThreshold(value);}
+	void setThreshold(double value) {Harmonicity::setThreshold(value);}
+	void setLPFCoefficient(double value) {Harmonicity::setLPFCoefficient(value);}
+	void setMaxPeaks(int value) {Harmonicity::setMaxPeaks(value);}
+	int getSpectrumSize() {return Harmonicity::getSpectrumSize();}
+	int getSampleRate() {return Harmonicity::getSampleRate();}
+	int getSearchRegionLength() {return Harmonicity::getSearchRegionLength();}
+	double getAbsThreshold() {return Harmonicity::getAbsThreshold();}
+	double getThreshold() {return Harmonicity::getThreshold();}
+	double getLPFCoefficient() {return Harmonicity::getLPFCoefficient();}
+	int getMaxPeaks() {return Harmonicity::getMaxPeaks();}
+};
+
+/*----------------------*
+ * Rice object wrappers *
+ *----------------------*/
+
+// These helper methods do things like converting to/from vectors of objects, multidimensional vectors, etc.
+
+// CircularArray
 template <>
 Object to_ruby<CircularArray*>(CircularArray* const & x) {
 	Array y;
 	
 	for (int i = 0; i < x->getSize(); i++)
-		y.push(x->getValueAt(i));
+		y.push(x->getValue(i));
 	
 	return y;
 }
 
+// Feature
 template <> 
 Object to_ruby<vector<Feature*> >(vector<Feature*> const & x) {
 	return Array(x.begin(), x.end());
@@ -42,29 +100,50 @@ vector<Feature*> from_ruby<vector<Feature*> >(Object x) {
 	return y;
 }
 
-float rb_mFeatureValue () {
-	return 0;
-}
-
-void rb_mFeatureCalculate() {
-	
+// 2D double vector
+template <>
+Object to_ruby<vector<double> >(vector<double> const & x) {
+	return Array(x.begin(), x.end());
 }
 
-Array rb_mFeatureHistory() {
-	return Array();
+template <>
+Object to_ruby<vector<vector<double> > >(vector<vector<double> > const & x) {
+	return Array(x.begin(), x.end());
 }
 
-string rb_mFeatureToString() {
-	return "Feature";
-}
+template <>
+vector<vector<double> > from_ruby<vector<vector<double> > >(Object x) {
+	vector<vector<double> > matrix;
+	
+	Array ruby_matrix(x);
+	
+	for (unsigned int i = 0; i < ruby_matrix.size(); i++) {
+		vector<double> row;
+		Array ruby_row(ruby_matrix[i]);
+		
+		for (unsigned int j = 0; j < ruby_row.size(); j++) {
+			double* value = (double*)(ruby_row[j].value());
+			row.push_back(*value);
+		}
+		
+		matrix.push_back(row);
+	}
 	
-Array rb_cSoundFeatures() {
-	return Array();
+	return matrix;
 }
 
+/*------------------------*
+ * Rice class definitions *
+ *------------------------*/
+
 extern "C" void Init_sirens() {
 	Module rb_mSirens = define_module("Sirens");
 	
+	/*
+	 	The following are simple class implementations with Rice. 
+		Nothing special. Just simple wrappers.
+	*/
+	
 	Data_Type<Sound> rb_cSound = 
 		define_class_under<Sound>(rb_mSirens, "Sound")
 		.define_constructor(Constructor<Sound>())
@@ -83,77 +162,131 @@ extern "C" void Init_sirens() {
 		.define_method("spectrumSize", &Sound::getSpectrumSize)
 		.define_method("path", &Sound::getPath)
 		.define_method("extractFeatures", &Sound::extractFeatures)
-		.define_method("saveFeaturesCSV", &Sound::saveFeaturesCSV)
-		.define_method("spectralFeatures", &Sound::getSpectralFeatures)
-		.define_method("spectralFeatures=", &Sound::setSpectralFeatures)
-		.define_method("sampleFeatures", &Sound::getSampleFeatures)
-		.define_method("sampleFeatures=", &Sound::setSampleFeatures);
+		.define_method("features", &Sound::getFeatures)
+		.define_method("features=", &Sound::setFeatures);
+	
+	Data_Type<FeatureSet> rb_cFeatureSet = 
+		define_class_under<FeatureSet>(rb_mSirens, "FeatureSet")
+		.define_constructor(Constructor<FeatureSet>())
+		.define_method("sampleFeatures", &FeatureSet::getSampleFeatures)
+		.define_method("sampleFeatures=", &FeatureSet::setSampleFeatures)
+		.define_method("spectralFeatures", &FeatureSet::getSpectralFeatures)
+		.define_method("spectralFeatures=", &FeatureSet::setSpectralFeatures)
+		.define_method("features", &FeatureSet::getFeatures);
 		
+	Data_Type<SegmentationParameters> rb_cSegmentationParameters = 
+		define_class_under<SegmentationParameters>(rb_mSirens, "SegmentationParameters")
+		.define_method("pLagPlus", &SegmentationParameters::getPLagPlus)
+		.define_method("pLagPlus=", &SegmentationParameters::setPLagPlus)
+		.define_method("pLagMinus", &SegmentationParameters::getPLagMinus)
+		.define_method("pLagMinus=", &SegmentationParameters::setPLagMinus)
+		.define_method("alpha", &SegmentationParameters::getAlpha)
+		.define_method("alpha=", &SegmentationParameters::setAlpha)
+		.define_method("r", &SegmentationParameters::getR)
+		.define_method("r=", &SegmentationParameters::setR)
+		.define_method("cStayOff", &SegmentationParameters::getCStayOff)
+		.define_method("cStayOff=", &SegmentationParameters::setCStayOff)
+		.define_method("cStayOn", &SegmentationParameters::getCStayOn)
+		.define_method("cStayOn=", &SegmentationParameters::setCStayOn)
+		.define_method("cTurnOn", &SegmentationParameters::getCTurnOn)
+		.define_method("cTurnOn=", &SegmentationParameters::setCTurnOn)
+		.define_method("cTurningOn", &SegmentationParameters::getCTurningOn)
+		.define_method("cTurningOn=", &SegmentationParameters::setCTurningOn)
+		.define_method("cTurnOff", &SegmentationParameters::getCTurnOff)
+		.define_method("cTurnOff=", &SegmentationParameters::setCTurnOff)
+		.define_method("cNewSegment", &SegmentationParameters::getCNewSegment)
+		.define_method("cNewSegment=", &SegmentationParameters::setCNewSegment);
+	
+	Data_Type<Segmenter> rb_cSegmenter = 
+		define_class_under<Segmenter>(rb_mSirens, "Segmenter")
+		.define_constructor(Constructor<Segmenter>())
+		.define_method("pNew", &Segmenter::getPNew)
+		.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("segment", &Segmenter::getSegments);
+		
+	/* 	
+		FeatureBase is an unused base class that implements Feature. Feature is the
+	 	actual class that implements RiceFeature, the wrapper Feature class that 
+		ensures Feature::segmentationParameters won't be garbage collected.
+	*/
+	
 	Data_Type<Feature> rb_cFeature = 
-		define_class_under<Feature>(rb_mSirens, "Feature")
+		define_class_under<Feature>(rb_mSirens, "FeatureBase")
 		.define_constructor(Constructor<Feature>())
 		.define_method("to_s", &Feature::toString)
 		.define_method("history", &Feature::getHistory)
 		.define_method("history[]", &Feature::getHistoryFrame)
 		.define_method("maxHistorySize", &Feature::getMaxHistorySize)
 		.define_method("maxHistorySize=", &Feature::setMaxHistorySize)
-		.define_method("value", &Feature::getValue);
-	
-	// rb_mFeature = define_module("Feature");
-	//rb_mFeature.define_module_function("history", &rb_mFeatureHistory);
-	//rb_mFeature.define_module_function("value", &rb_mFeatureValue);
-	//rb_mFeature.define_module_function("calculate", &rb_mFeatureCalculate);
-	//rb_mFeature.define_module_function("to_s", rb_mFeatureToString);
-	
-	Data_Type<Loudness> rb_cLoudness = 
-		define_class_under<Loudness, Feature>(rb_mSirens, "Loudness")
-		.define_constructor(Constructor<Loudness>());
-	
-	Data_Type<Harmonicity> rb_cHarmonicity = 
-		define_class_under<Harmonicity, Feature>(rb_mSirens, "Harmonicity")
-		.define_constructor(Constructor<Harmonicity>())
-		.define_method("sampleRate", &Harmonicity::getSampleRate)
-		.define_method("sampleRate=", &Harmonicity::setSampleRate)
-		.define_method("spectrumSize", &Harmonicity::getSpectrumSize)
-		.define_method("spectrumSize=", &Harmonicity::setSpectrumSize)
-		.define_method("searchRegionLength", &Harmonicity::getSearchRegionLength)
-		.define_method("searchRegionLength=", &Harmonicity::setSearchRegionLength)
-		.define_method("absThreshold", &Harmonicity::getAbsThreshold)
-		.define_method("absThreshold=", &Harmonicity::setAbsThreshold)
-		.define_method("threshold", &Harmonicity::getThreshold)
-		.define_method("threshold=", &Harmonicity::setThreshold)
-		.define_method("lpfCoefficient", &Harmonicity::getLPFCoefficient)
-		.define_method("lpfCoefficient=", &Harmonicity::setLPFCoefficient)
-		.define_method("maxPeaks", &Harmonicity::getMaxPeaks)
-		.define_method("maxPeaks=", &Harmonicity::setMaxPeaks);
+		.define_method("value", &Feature::getValue)
+		.define_method("min", &Feature::getMin)
+		.define_method("min=", &Feature::setMin)
+		.define_method("max", &Feature::getMax)
+		.define_method("max=", &Feature::setMax);
+	
+	Data_Type<RiceFeature> rb_cRiceFeature = 
+		define_class_under<RiceFeature, Feature>(rb_mSirens, "Feature")
+		.define_method("segmentationParameters", &RiceFeature::getRiceSegmentationParameters);
+	
+	/*
+		All the following features implement Rice[FeatueName] and inherit from RiceFeature.
+		Rice makes it necessary to re-implement all accessors, as it does not support
+		sending a pointer to a parent class's method for method implementations.
+	*/
+	
+	Data_Type<RiceLoudness> rb_cLoudness = 
+		define_class_under<RiceLoudness, RiceFeature>(rb_mSirens, "Loudness")
+		.define_constructor(Constructor<RiceLoudness>());
+	
+	Data_Type<RiceHarmonicity> rb_cHarmonicity = 
+		define_class_under<RiceHarmonicity, RiceFeature>(rb_mSirens, "Harmonicity")
+		.define_constructor(Constructor<RiceHarmonicity>())
+		.define_method("sampleRate", &RiceHarmonicity::getSampleRate)
+		.define_method("sampleRate=", &RiceHarmonicity::setSampleRate)
+		.define_method("spectrumSize", &RiceHarmonicity::getSpectrumSize)
+		.define_method("spectrumSize=", &RiceHarmonicity::setSpectrumSize)
+		.define_method("searchRegionLength", &RiceHarmonicity::getSearchRegionLength)
+		.define_method("searchRegionLength=", &RiceHarmonicity::setSearchRegionLength)
+		.define_method("absThreshold", &RiceHarmonicity::getAbsThreshold)
+		.define_method("absThreshold=", &RiceHarmonicity::setAbsThreshold)
+		.define_method("threshold", &RiceHarmonicity::getThreshold)
+		.define_method("threshold=", &RiceHarmonicity::setThreshold)
+		.define_method("lpfCoefficient", &RiceHarmonicity::getLPFCoefficient)
+		.define_method("lpfCoefficient=", &RiceHarmonicity::setLPFCoefficient)
+		.define_method("maxPeaks", &RiceHarmonicity::getMaxPeaks)
+		.define_method("maxPeaks=", &RiceHarmonicity::setMaxPeaks);
 		
-	Data_Type<TransientIndex> rb_cTransientIndex = 
-		define_class_under<TransientIndex, Feature>(rb_mSirens, "TransientIndex")
-		.define_constructor(Constructor<TransientIndex>())
-		.define_method("sampleRate", &TransientIndex::getSampleRate)
-		.define_method("sampleRate=", &TransientIndex::setSampleRate)
-		.define_method("spectrumSize", &TransientIndex::getSpectrumSize)
-		.define_method("spectrumSize=", &TransientIndex::setSpectrumSize)
-		.define_method("filters", &TransientIndex::getFilters)
-		.define_method("filters=", &TransientIndex::setFilters)
-		.define_method("mels", &TransientIndex::getMels)
-		.define_method("mels=", &TransientIndex::setMels);
+	Data_Type<RiceTransientIndex> rb_cTransientIndex = 
+		define_class_under<RiceTransientIndex, RiceFeature>(rb_mSirens, "TransientIndex")
+		.define_constructor(Constructor<RiceTransientIndex>())
+		.define_method("sampleRate", &RiceTransientIndex::getSampleRate)
+		.define_method("sampleRate=", &RiceTransientIndex::setSampleRate)
+		.define_method("spectrumSize", &RiceTransientIndex::getSpectrumSize)
+		.define_method("spectrumSize=", &RiceTransientIndex::setSpectrumSize)
+		.define_method("filters", &RiceTransientIndex::getFilters)
+		.define_method("filters=", &RiceTransientIndex::setFilters)
+		.define_method("mels", &RiceTransientIndex::getMels)
+		.define_method("mels=", &RiceTransientIndex::setMels);
 		
-	Data_Type<SpectralCentroid> rb_cSpectralCentroid = 
-		define_class_under<SpectralCentroid, Feature>(rb_mSirens, "SpectralCentroid")
-		.define_constructor(Constructor<SpectralCentroid>())
-		.define_method("sampleRate", &SpectralCentroid::getSampleRate)
-		.define_method("sampleRate=", &SpectralCentroid::setSampleRate)
-		.define_method("spectrumSize", &SpectralCentroid::getSpectrumSize)
-		.define_method("spectrumSize=", &SpectralCentroid::setSpectrumSize);
+	Data_Type<RiceSpectralCentroid> rb_cSpectralCentroid = 
+		define_class_under<RiceSpectralCentroid, RiceFeature>(rb_mSirens, "SpectralCentroid")
+		.define_constructor(Constructor<RiceSpectralCentroid>())
+		.define_method("sampleRate", &RiceSpectralCentroid::getSampleRate)
+		.define_method("sampleRate=", &RiceSpectralCentroid::setSampleRate)
+		.define_method("spectrumSize", &RiceSpectralCentroid::getSpectrumSize)
+		.define_method("spectrumSize=", &RiceSpectralCentroid::setSpectrumSize);
 		
-	Data_Type<SpectralSparsity> rb_cSpectralSparsity = 
-		define_class_under<SpectralSparsity, Feature>(rb_mSirens, "SpectralSparsity")
-		.define_constructor(Constructor<SpectralSparsity>());
+	Data_Type<RiceSpectralSparsity> rb_cSpectralSparsity = 
+		define_class_under<RiceSpectralSparsity, RiceFeature>(rb_mSirens, "SpectralSparsity")
+		.define_constructor(Constructor<RiceSpectralSparsity>());
 			
-	Data_Type<TemporalSparsity> rb_cTemporalSparsity = 
-		define_class_under<TemporalSparsity, Feature>(rb_mSirens, "TemporalSparsity")
-		.define_constructor(Constructor<TemporalSparsity>())
-		.define_method("windowSize", &TemporalSparsity::getWindowSize)
-		.define_method("windowSize=", &TemporalSparsity::setWindowSize);
+	Data_Type<RiceTemporalSparsity> rb_cTemporalSparsity = 
+		define_class_under<RiceTemporalSparsity, RiceFeature>(rb_mSirens, "TemporalSparsity")
+		.define_constructor(Constructor<RiceTemporalSparsity>())
+		.define_method("windowSize", &RiceTemporalSparsity::getWindowSize)
+		.define_method("windowSize=", &RiceTemporalSparsity::setWindowSize);
 }

data/sirens.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sirens}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brandon Mechtley"]
-  s.date = %q{2009-07-13}
+  s.date = %q{2009-08-24}
   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"]
@@ -19,16 +19,14 @@ Gem::Specification.new do |s|
      "README.markdown",
      "Rakefile",
      "VERSION",
+     "examples/segmentation.rb",
      "examples/sound.wav",
      "examples/three_features.rb",
      "ext/sirens/extconf.rb",
      "ext/sirens/extconf.rb",
      "ext/sirens/sirens.cpp",
      "ext/sirens/sirens.cpp",
-     "sirens.gemspec",
-     "test/sirens/sirens_test.rb",
-     "test/sirens/test.wav",
-     "test/sirens/test_helper.rb"
+     "sirens.gemspec"
   ]
   s.homepage = %q{http://github.com/plant/sirens-ruby}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -36,8 +34,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.3}
   s.summary = %q{Ruby gem that for the Sirens library.}
   s.test_files = [
-    "test/sirens/sirens_test.rb",
-     "test/sirens/test_helper.rb",
+    "examples/segmentation.rb",
      "examples/three_features.rb"
   ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: plant-sirens
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Brandon Mechtley
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-13 00:00:00 -07:00
+date: 2009-08-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,16 +36,15 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
+- examples/segmentation.rb
 - examples/sound.wav
 - examples/three_features.rb
 - ext/sirens/extconf.rb
 - ext/sirens/sirens.cpp
 - sirens.gemspec
-- test/sirens/sirens_test.rb
-- test/sirens/test.wav
-- test/sirens/test_helper.rb
 has_rdoc: false
 homepage: http://github.com/plant/sirens-ruby
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -66,11 +65,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby gem that for the Sirens library.
 test_files: 
-- test/sirens/sirens_test.rb
-- test/sirens/test_helper.rb
+- examples/segmentation.rb
 - examples/three_features.rb

data/test/sirens/sirens_test.rb

@@ -1,67 +0,0 @@
-require 'rubygems'
-require 'sirens'
-
-s = Sirens::Sound.new
-s.frameLength = 0.04
-s.hopLength = 0.02
-s.open 'test/sirens/test.wav'
-
-print "\n", s
-print "\n\tPath: ", s.path
-print "\n\tSamples: ", s.samples
-print "\n\tSample rate: ", s.sampleRate
-print "\n\tFrame length: ", s.frameLength, "s (", s.samplesPerFrame, " samples)"
-print "\n\tHop length: ", s.hopLength, "s (", s.samplesPerHop, " samples)"
-print "\n\tFFT Size: ", s.fftSize
-print "\n\tSpectrum size: ", s.spectrumSize
-print "\n\n"
-
-loudness = Sirens::LoudnessFeature.new
-temporal_sparsity = Sirens::TemporalSparsityFeature.new
-spectral_sparsity = Sirens::SpectralSparsityFeature.new
-spectral_centroid = Sirens::SpectralCentroidFeature.new
-
-harmonicity = Sirens::HarmonicityFeature.new
-harmonicity.absThreshold = 1
-harmonicity.threshold = 0.1
-harmonicity.searchRegionLength = 5
-harmonicity.maxPeaks = 3
-harmonicity.lpfCoefficient = 0.7
-
-transient_index = Sirens::TransientIndexFeature.new
-transient_index.mels = 15
-transient_index.filters = 30
-
-Array[loudness, temporal_sparsity, spectral_sparsity, spectral_centroid, harmonicity, transient_index].each do |feature|
-  feature.historySize = s.frames
-end
-
-Array[spectral_centroid, harmonicity, transient_index].each do |feature|
-  feature.sampleRate = s.sampleRate
-  feature.spectrumSize = s.spectrumSize
-end
-
-s.sampleFeatures = Array[loudness, temporal_sparsity]
-s.spectralFeatures = Array[spectral_sparsity, spectral_centroid, transient_index, harmonicity]
-
-t1 = Time.new
-
-s.extractFeatures
-
-t2 = Time.new
-
-print 'Elapsed time: ', (t2 - t1), "\n\n"
-
-histories = Array[loudness.history, temporal_sparsity.history, spectral_sparsity.history, 
-  spectral_centroid.history, transient_index.history, harmonicity.history]
-
-file = File.new("test/sirens/features.csv", File::CREAT|File::RDWR, 0644)
-for i in 0..s.frames - 1
-  for j in 0..histories.size - 1
-    file.write(histories[j][i])
-    file.write(',') if i < histories.size - 1
-  end
-  
-  file.write("\n")
-end
-

data/test/sirens/test_helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'soundwalk-api'
-
-class Test::Unit::TestCase
-end