From 35bd3951fff19d7994a1b4f743247f32ed368d7e Mon Sep 17 00:00:00 2001
From: shahules786 <shahules786@gmail.com>
Date: Fri, 30 Sep 2022 19:03:06 +0530
Subject: [PATCH] simplify  matching function

---
 enhancer/data/dataset.py       |  7 +++++--
 enhancer/data/fileprocessor.py | 18 +++++++++++++-----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/enhancer/data/dataset.py b/enhancer/data/dataset.py
index fc871b8..4c485c8 100644
--- a/enhancer/data/dataset.py
+++ b/enhancer/data/dataset.py
@@ -109,8 +109,11 @@ class EnhancerDataset(TaskDataset):
         batch size of each batch
     num_workers : int
         num workers to be used while training
-    matching_function : 
-        custom function for dataset processing.
+    matching_function : str
+        maching functions - (one_to_one,one_to_many). Default set to None.
+        use one_to_one mapping for datasets with one noisy file for each clean file
+        use one_to_many mapping for multiple noisy files for each clean file
+
     
     """
 
diff --git a/enhancer/data/fileprocessor.py b/enhancer/data/fileprocessor.py
index d38e04f..eab41a0 100644
--- a/enhancer/data/fileprocessor.py
+++ b/enhancer/data/fileprocessor.py
@@ -4,6 +4,8 @@ from re import S
 import numpy as np
 from scipy.io import wavfile
 
+MATCHING_FNS = ("one_to_one","one_to_many")
+
 class ProcessorFunctions:
 
     @staticmethod
@@ -73,12 +75,18 @@ class Fileprocessor:
                 matching_function=None
         ):
 
-        if name.lower() == "vctk":
-            return cls(clean_dir,noisy_dir, ProcessorFunctions.one_to_one)
-        elif name.lower() == "dns-2020":
-            return cls(clean_dir,noisy_dir, ProcessorFunctions.one_to_many)
+        if matching_function is None:
+            if name.lower() == "vctk":
+                return cls(clean_dir,noisy_dir, ProcessorFunctions.one_to_one)
+            elif name.lower() == "dns-2020":
+                return cls(clean_dir,noisy_dir, ProcessorFunctions.one_to_many)
         else:
-            return cls(clean_dir,noisy_dir, matching_function)
+            if matching_function not in MATCHING_FNS:
+                raise ValueError(F"Invalid matching function! Avaialble options are {MATCHING_FNS}")
+            else:
+                return cls(clean_dir,noisy_dir, getattr(ProcessorFunctions,matching_function))
+
+            
 
     def prepare_matching_dict(self):