diff options
| author | John Glover <j@johnglover.net> | 2012-08-11 19:57:43 +0100 |
|---|---|---|
| committer | John Glover <j@johnglover.net> | 2012-08-11 19:57:43 +0100 |
| commit | 4c32842b65e0b810e8f476dfe0700d55fdea47e0 (patch) | |
| tree | e28f3f157a8b4b5ddda4c69ff76001e5b9c75468 | |
| parent | a22435336757898acff9cd4be1e473bf3bb6c032 (diff) | |
| download | simpl-4c32842b65e0b810e8f476dfe0700d55fdea47e0.tar.gz simpl-4c32842b65e0b810e8f476dfe0700d55fdea47e0.tar.bz2 simpl-4c32842b65e0b810e8f476dfe0700d55fdea47e0.zip | |
[simpl] Tidy up __init__.
| -rw-r--r-- | simpl/__init__.py | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/simpl/__init__.py b/simpl/__init__.py index 3b70fb5..de1c3d0 100644 --- a/simpl/__init__.py +++ b/simpl/__init__.py @@ -1,45 +1,37 @@ import numpy as np -dtype = np.double - import base +import peak_detection +import partial_tracking +import synthesis +import residual +import plot +import audio +import pybase + +dtype = np.double Frame = base.Frame Peak = base.Peak - -import peak_detection PeakDetection = peak_detection.PeakDetection SMSPeakDetection = peak_detection.SMSPeakDetection SndObjPeakDetection = peak_detection.SndObjPeakDetection - -import partial_tracking PartialTracking = partial_tracking.PartialTracking SMSPartialTracking = partial_tracking.SMSPartialTracking - -import synthesis +SndObjPartialTracking = partial_tracking.SndObjPartialTracking Synthesis = synthesis.Synthesis SMSSynthesis = synthesis.SMSSynthesis - -import residual Residual = residual.Residual SMSResidual = residual.SMSResidual - -import pybase +plot_peaks = plot.plot_peaks +plot_partials = plot.plot_partials +read_wav = audio.read_wav Partial = pybase.Partial -Residual = pybase.Residual compare_peak_amps = pybase.compare_peak_amps compare_peak_freqs = pybase.compare_peak_freqs import pysndobj -SndObjPartialTracking = pysndobj.SndObjPartialTracking SndObjSynthesis = pysndobj.SndObjSynthesis import mq MQPeakDetection = mq.MQPeakDetection MQPartialTracking = mq.MQPartialTracking MQSynthesis = mq.MQSynthesis - -import plot -plot_peaks = plot.plot_peaks -plot_partials = plot.plot_partials - -import audio -read_wav = audio.read_wav |