From a073fe5f065c24eb31e8bee34e3bdcd16a3d8416 Mon Sep 17 00:00:00 2001 From: John Glover Date: Sat, 7 Jul 2012 16:08:41 +0200 Subject: [simpl] Use Cython SMSSynthesis and SMSResidual. --- simpl/__init__.py | 15 ++++++++------- 1 file 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 -- cgit v1.2.3