editing to make merge easier

pseeth · Jan 30, 2020 · 519307c · 519307c
1 parent 0a1c3cf
commit 519307c
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 41 deletions.
diff --git a/tests/data/.DS_Store b/tests/data/.DS_Store
diff --git a/tests/test_core.py b/tests/test_core.py
@@ -1037,6 +1037,48 @@ def test_scaper_instantiate():
         _compare_scaper_jams(jam, regjam)
 
 
+def test_generate_with_seeding(atol=1e-4, rtol=1e-8):
+    # test a scaper generator with different random seeds. init with same random seed
+    # over and over to make sure the output wav stays the same
+    seeds = [
+        0, 10, 20, 
+        scaper.util._check_random_state(0),
+        scaper.util._check_random_state(10),
+        scaper.util._check_random_state(20)
+    ]
+    num_generators = 3
+    for seed in seeds:
+        generators = []
+        for i in range(num_generators):
+            generators.append(create_scaper_with_random_seed(seed))
+
+        tmpfiles = []
+        with _close_temp_files(tmpfiles):
+            wav_files = [
+                tempfile.NamedTemporaryFile(suffix='.wav', delete=True) 
+                for i in range(num_generators)
+            ]
+            jam_files = [
+                tempfile.NamedTemporaryFile(suffix='.jams', delete=True) 
+                for i in range(num_generators)
+            ]
+            txt_files = [
+                tempfile.NamedTemporaryFile(suffix='.txt', delete=True) 
+                for i in range(num_generators)
+            ]
+
+            tmpfiles += wav_files + jam_files + txt_files
+            for i, sc in enumerate(generators):
+                generators[i].generate(
+                    wav_files[i].name, jam_files[i].name, txt_path=txt_files[i].name,
+                        disable_instantiation_warnings=True
+                )
+
+            audio = [soundfile.read(wav_file.name)[0] for wav_file in wav_files]
+            for i, a in enumerate(audio):
+                assert np.allclose(audio[0], a, atol=atol, rtol=rtol)
+
+
 def create_scaper_with_random_seed(seed):
     sc = scaper.Scaper(10.0, fg_path=FG_PATH, bg_path=BG_PATH, random_state=deepcopy(seed))
     sc.ref_db = -50
@@ -1091,47 +1133,6 @@ def create_scaper_with_random_seed(seed):
     return sc
 
 
-def test_generate_with_seeding(atol=1e-4, rtol=1e-8):
-    # test a scaper generator with different random seeds. init with same random seed
-    # over and over to make sure the output wav stays the same
-    seeds = [
-        0, 10, 20, 
-        scaper.util._check_random_state(0),
-        scaper.util._check_random_state(10),
-        scaper.util._check_random_state(20)
-    ]
-    num_generators = 3
-    for seed in seeds:
-        generators = []
-        for i in range(num_generators):
-            generators.append(create_scaper_with_random_seed(seed))
-
-        tmpfiles = []
-        with _close_temp_files(tmpfiles):
-            wav_files = [
-                tempfile.NamedTemporaryFile(suffix='.wav', delete=True) 
-                for i in range(num_generators)
-            ]
-            jam_files = [
-                tempfile.NamedTemporaryFile(suffix='.jams', delete=True) 
-                for i in range(num_generators)
-            ]
-            txt_files = [
-                tempfile.NamedTemporaryFile(suffix='.txt', delete=True) 
-                for i in range(num_generators)
-            ]
-
-            tmpfiles += wav_files + jam_files + txt_files
-            for i, sc in enumerate(generators):
-                generators[i].generate(
-                    wav_files[i].name, jam_files[i].name, txt_path=txt_files[i].name,
-                        disable_instantiation_warnings=True
-                )
-
-            audio = [soundfile.read(wav_file.name)[0] for wav_file in wav_files]
-            for i, a in enumerate(audio):
-                assert np.allclose(audio[0], a, atol=atol, rtol=rtol)
-
 def test_generate_audio():
     for sr in (44100, 22050):
         REG_WAV_PATH = TEST_PATHS[sr]['REG'].wav