diff options
| author | John Glover <j@johnglover.net> | 2012-07-07 16:08:41 +0200 |
|---|---|---|
| committer | John Glover <j@johnglover.net> | 2012-07-07 16:08:41 +0200 |
| commit | a073fe5f065c24eb31e8bee34e3bdcd16a3d8416 (patch) | |
| tree | fb60be2aa1eeac8e91039ec8a953cd19cda5cec7 | |
| parent | 17cb5fc6c910bf11e0e9622eba9fe7756bd3150e (diff) | |
| download | simpl-a073fe5f065c24eb31e8bee34e3bdcd16a3d8416.tar.gz simpl-a073fe5f065c24eb31e8bee34e3bdcd16a3d8416.tar.bz2 simpl-a073fe5f065c24eb31e8bee34e3bdcd16a3d8416.zip | |
[simpl] Use Cython SMSSynthesis and SMSResidual.
| -rw-r--r-- | simpl/__init__.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/simpl/__init__.py b/simpl/__init__.py index 24bf50b..515e052 100644 --- a/simpl/__init__.py +++ b/simpl/__init__.py @@ -13,10 +13,16 @@ import partial_tracking PartialTracking = partial_tracking.PartialTracking SMSPartialTracking = partial_tracking.SMSPartialTracking +import synthesis +Synthesis = synthesis.Synthesis +SMSSynthesis = synthesis.SMSSynthesis + +import residual +Residual = residual.Residual +SMSResidual = residual.SMSResidual + import pybase Partial = pybase.Partial -# PartialTracking = pybase.PartialTracking -Synthesis = pybase.Synthesis Residual = pybase.Residual compare_peak_amps = pybase.compare_peak_amps compare_peak_freqs = pybase.compare_peak_freqs @@ -26,11 +32,6 @@ SndObjPeakDetection = sndobj.SndObjPeakDetection SndObjPartialTracking = sndobj.SndObjPartialTracking SndObjSynthesis = sndobj.SndObjSynthesis -import pysms -# SMSPartialTracking = pysms.SMSPartialTracking -SMSSynthesis = pysms.SMSSynthesis -SMSResidual = pysms.SMSResidual - import mq MQPeakDetection = mq.MQPeakDetection MQPartialTracking = mq.MQPartialTracking |