Update workflow_multiple_species.py, workflow_single_file.py, and wor…

…kflow_single_species.py
ear-team · Dec 13, 2022 · 614d930 · 614d930
1 parent 704fb6f
commit 614d930
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/examples/workflow_multiple_species.py b/examples/workflow_multiple_species.py
@@ -32,15 +32,16 @@
 ROIS_NAME       = Path(str(DATASET_NAME) +'_ROIS')
 
 # List of species to build a clean dataset
-SCIENTIC_NAME_LIST = [
-                        "Regulus regulus",
+SCIENTIC_NAME_LIST = [ 
+                        "Columba palumbus",
+                        # "Regulus regulus",
                         "Phylloscopus collybita",
-                        "Anthus triviali", 
+                        # "Anthus triviali", 
                         "Fringilla coelebs", 
-                        "Troglodytes troglodytes", 
-                        "Phoenicurus phoenicurus", 
-                        "Strix aluco", 
-                        "Aegithalos caudatus",
+                        # "Troglodytes troglodytes", 
+                        # "Phoenicurus phoenicurus", 
+                        # "Strix aluco", 
+                        # "Aegithalos caudatus",
                       ]
 
 CONFIG_FILE = '../config_default.yaml' 
@@ -83,7 +84,6 @@
     # ROIS extraction of the full dataset
     df_rois, csv_rois = bambird.multicpu_extract_rois(
                         dataset     = df_xc,
-                        fun         = params['PARAMS_EXTRACT']['FUNC'],
                         params      = params['PARAMS_EXTRACT'],
                         save_path   = TEMP_DIR / ROIS_NAME,
                         overwrite   = True,
@@ -131,8 +131,8 @@
     bambird.overlay_rois(
                         cluster         = df_cluster,
                         params          = params['PARAMS_EXTRACT'],
-                        column_labels   = 'cluster_number', #auto_label cluster_number
-                        unique_labels   = np.sort(df_cluster.cluster_number.unique()),
+                        column_labels   = 'auto_label', #auto_label cluster_number
+                        unique_labels   = np.sort(df_cluster.auto_label.unique()),
                         filename        = None,
                         random_seed     = None,
                         verbose         = True

diff --git a/examples/workflow_single_file.py b/examples/workflow_single_file.py
@@ -31,9 +31,9 @@
 DATASET_NAME    = Path('WORKFLOW_SINGLE_FILE')
 ROIS_NAME       = Path(str(DATASET_NAME) +'_ROIS')
 
-# Xeno-Canto number (ie. 473724 for a audio of Columba palumbus https://xeno-canto.org/758652)
+# Xeno-Canto number (ie. 758652 for a audio of Columba palumbus https://xeno-canto.org/758652)
 # Without XC
-XC_NUMBER = 473724
+XC_NUMBER = 758652
 
 CONFIG_FILE = '../config_default.yaml' 
 

diff --git a/examples/workflow_single_species.py b/examples/workflow_single_species.py
@@ -98,7 +98,6 @@
     # ROIS extraction of the full dataset
     df_rois, csv_rois = bambird.multicpu_extract_rois(
                         dataset     = df_xc,
-                        fun         = params['PARAMS_EXTRACT']['FUNC'],
                         params      = params['PARAMS_EXTRACT'],
                         save_path   = TEMP_DIR / ROIS_NAME,
                         overwrite   = True,