nkululeko 0.86.6__tar.gz → 0.86.7__tar.gz

{nkululeko-0.86.6 → nkululeko-0.86.7}/CHANGELOG.md

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+Version 0.86.7
+--------------
+* handles now audformat tables where the target is in a file index
+  
 Version 0.86.6
 --------------
 * now best (not last) result is shown at end

{nkululeko-0.86.6/nkululeko.egg-info → nkululeko-0.86.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.86.6
+Version: 0.86.7
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -343,6 +343,10 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+Version 0.86.7
+--------------
+* handles now audformat tables where the target is in a file index
+  
 Version 0.86.6
 --------------
 * now best (not last) result is shown at end

{nkululeko-0.86.6 → nkululeko-0.86.7}/nkululeko/constants.py

@@ -1,2 +1,2 @@
-VERSION="0.86.6"
+VERSION="0.86.7"
 SAMPLING_RATE = 16000

{nkululeko-0.86.6 → nkululeko-0.86.7}/nkululeko/data/dataset.py

@@ -150,6 +150,13 @@ class Dataset:
                 self.got_speaker = got_speaker2 or self.got_speaker
                 self.got_gender = got_gender2 or self.got_gender
                 self.got_age = got_age2 or self.got_age
+                if audformat.is_filewise_index(df_target.index):
+                    try:
+                        df_target = df_target.loc[df.index.get_level_values("file")]
+                        df_target = df_target.set_index(df.index)
+                    except KeyError:
+                        # just a try...
+                        pass
                 if got_target2:
                     df[self.target] = df_target[self.target]
                 if got_speaker2:
@@ -255,6 +262,7 @@ class Dataset:
         df = pd.DataFrame()
         for table in df_files:
             source_df = db.tables[table].df
+            # check if columns should be renamed
             source_df = self._check_cols(source_df)
             # create a dataframe with the index (the filenames)
             df_local = pd.DataFrame(index=source_df.index)

{nkululeko-0.86.6 → nkululeko-0.86.7}/nkululeko/runmanager.py

@@ -151,7 +151,6 @@ class Runmanager:
             report: for which report (will be computed newly from model)
             plot_name: name of plot file
         """
-        epoch = reporter.epoch
         # self.load_model(report)
         # report = self.model.predict()
         self.util.debug(f"plotting conf matrix to {plot_name}")

{nkululeko-0.86.6 → nkululeko-0.86.7/nkululeko.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.86.6
+Version: 0.86.7
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -343,6 +343,10 @@ F. Burkhardt, Johannes Wagner, Hagen Wierstorf, Florian Eyben and Björn Schulle
 Changelog
 =========
 
+Version 0.86.7
+--------------
+* handles now audformat tables where the target is in a file index
+  
 Version 0.86.6
 --------------
 * now best (not last) result is shown at end