Restructure class files.

Group classes by type (peak detection, partial
tracking, etc) rather than by algorithm name. This
is because Cython needs the full inheritance
hierarchy to be in the same file.

7 files changed, 121 insertions, 79 deletions

diff --git a/tests/test_base.py b/tests/test_base.py
index 1fe5881..9d3173a 100644
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -1,7 +1,6 @@
 import os
 import numpy as np
 from nose.tools import assert_almost_equals
-import simpl
 import simpl.base as base
 
 float_precision = 5
@@ -69,70 +68,3 @@ class TestFrame(object):
                              float_precision)
         assert_almost_equals(f.partial(0).frequency, p.frequency,
                              float_precision)
-
-
-class TestPeakDetection(object):
-    @classmethod
-    def setup_class(cls):
-        cls.audio = simpl.read_wav(audio_path)[0]
-
-    def test_peak_detection(self):
-        pd = base.PeakDetection()
-        pd.find_peaks(self.audio)
-
-        assert len(pd.frames) == len(self.audio) / hop_size
-        assert len(pd.frames[0].peaks) == 0
-
-
-class TestPartialTracking(object):
-    @classmethod
-    def setup_class(cls):
-        cls.audio = simpl.read_wav(audio_path)[0]
-
-    def test_partial_tracking(self):
-        pd = base.PeakDetection()
-        frames = pd.find_peaks(self.audio)
-
-        pt = base.PartialTracking()
-        frames = pt.find_partials(frames)
-
-        assert len(frames) == len(self.audio) / hop_size
-        assert len(frames[0].partials) == 100
-
-
-class TestSynthesis(object):
-    @classmethod
-    def setup_class(cls):
-        cls.audio = simpl.read_wav(audio_path)[0]
-
-    def test_synthesis(self):
-        pd = base.PeakDetection()
-        frames = pd.find_peaks(self.audio)
-
-        pt = base.PartialTracking()
-        frames = pt.find_partials(frames)
-
-        s = base.Synthesis()
-        synth_audio = s.synth(frames)
-
-        assert len(synth_audio)
-
-
-class TestResidual(object):
-    @classmethod
-    def setup_class(cls):
-        cls.audio = simpl.read_wav(audio_path)[0]
-
-    def test_synthesis(self):
-        pd = base.PeakDetection()
-        frames = pd.find_peaks(self.audio)
-
-        pt = base.PartialTracking()
-        frames = pt.find_partials(frames)
-
-        s = base.Synthesis()
-        synth_audio = s.synth(frames)
-
-        r = base.Residual()
-        residual_audio = r.find_residual(synth_audio, self.audio)
-        assert len(residual_audio)
diff --git a/tests/test_partial_tracking.py b/tests/test_partial_tracking.py
new file mode 100644
index 0000000..004ded7
--- /dev/null
+++ b/tests/test_partial_tracking.py
@@ -0,0 +1,29 @@
+import os
+import numpy as np
+from nose.tools import assert_almost_equals
+import simpl
+import simpl.peak_detection as peak_detection
+import simpl.partial_tracking as partial_tracking
+
+float_precision = 5
+frame_size = 512
+hop_size = 512
+audio_path = os.path.join(
+    os.path.dirname(__file__), 'audio/flute.wav'
+)
+
+
+class TestPartialTracking(object):
+    @classmethod
+    def setup_class(cls):
+        cls.audio = simpl.read_wav(audio_path)[0]
+
+    def test_partial_tracking(self):
+        pd = peak_detection.PeakDetection()
+        frames = pd.find_peaks(self.audio)
+
+        pt = partial_tracking.PartialTracking()
+        frames = pt.find_partials(frames)
+
+        assert len(frames) == len(self.audio) / hop_size
+        assert len(frames[0].partials) == 100
diff --git a/tests/test_peak_detection.py b/tests/test_peak_detection.py
new file mode 100644
index 0000000..b24b701
--- /dev/null
+++ b/tests/test_peak_detection.py
@@ -0,0 +1,25 @@
+import os
+import numpy as np
+from nose.tools import assert_almost_equals
+import simpl
+import simpl.peak_detection as peak_detection
+
+float_precision = 5
+frame_size = 512
+hop_size = 512
+audio_path = os.path.join(
+    os.path.dirname(__file__), 'audio/flute.wav'
+)
+
+
+class TestPeakDetection(object):
+    @classmethod
+    def setup_class(cls):
+        cls.audio = simpl.read_wav(audio_path)[0]
+
+    def test_peak_detection(self):
+        pd = peak_detection.PeakDetection()
+        pd.find_peaks(self.audio)
+
+        assert len(pd.frames) == len(self.audio) / hop_size
+        assert len(pd.frames[0].peaks) == 0
diff --git a/tests/test_peakdetection.py b/tests/test_peakdetection.py
deleted file mode 100644
index 0cb24b2..0000000
--- a/tests/test_peakdetection.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import simpl
-import numpy as np
-from scipy.io.wavfile import read
-
-
-class TestPeakDetection(object):
-    frame_size = 2048
-    hop_size = 512
-    max_peaks = 10
diff --git a/tests/test_residual.py b/tests/test_residual.py
new file mode 100644
index 0000000..205ee59
--- /dev/null
+++ b/tests/test_residual.py
@@ -0,0 +1,35 @@
+import os
+import numpy as np
+from nose.tools import assert_almost_equals
+import simpl
+import simpl.peak_detection as peak_detection
+import simpl.partial_tracking as partial_tracking
+import simpl.synthesis as synthesis
+import simpl.residual as residual
+
+float_precision = 5
+frame_size = 512
+hop_size = 512
+audio_path = os.path.join(
+    os.path.dirname(__file__), 'audio/flute.wav'
+)
+
+
+class TestResidual(object):
+    @classmethod
+    def setup_class(cls):
+        cls.audio = simpl.read_wav(audio_path)[0]
+
+    def test_synthesis(self):
+        pd = peak_detection.PeakDetection()
+        frames = pd.find_peaks(self.audio)
+
+        pt = partial_tracking.PartialTracking()
+        frames = pt.find_partials(frames)
+
+        s = synthesis.Synthesis()
+        synth_audio = s.synth(frames)
+
+        r = residual.Residual()
+        residual_audio = r.find_residual(synth_audio, self.audio)
+        assert len(residual_audio)
diff --git a/tests/test_sms.py b/tests/test_sms.py
index 514ead4..98b48c2 100644
--- a/tests/test_sms.py
+++ b/tests/test_sms.py
@@ -6,8 +6,6 @@ import simpl
 import simpl.simplsms as simplsms
 
 float_precision = 2
-frame_size = 512
-hop_size = 512
 audio_path = os.path.join(
     os.path.dirname(__file__), 'audio/flute.wav'
 )
diff --git a/tests/test_synthesis.py b/tests/test_synthesis.py
new file mode 100644
index 0000000..794b047
--- /dev/null
+++ b/tests/test_synthesis.py
@@ -0,0 +1,32 @@
+import os
+import numpy as np
+from nose.tools import assert_almost_equals
+import simpl
+import simpl.peak_detection as peak_detection
+import simpl.partial_tracking as partial_tracking
+import simpl.synthesis as synthesis
+
+float_precision = 5
+frame_size = 512
+hop_size = 512
+audio_path = os.path.join(
+    os.path.dirname(__file__), 'audio/flute.wav'
+)
+
+
+class TestSynthesis(object):
+    @classmethod
+    def setup_class(cls):
+        cls.audio = simpl.read_wav(audio_path)[0]
+
+    def test_synthesis(self):
+        pd = peak_detection.PeakDetection()
+        frames = pd.find_peaks(self.audio)
+
+        pt = partial_tracking.PartialTracking()
+        frames = pt.find_partials(frames)
+
+        s = synthesis.Synthesis()
+        synth_audio = s.synth(frames)
+
+        assert len(synth_audio)