nkululeko 0.93.1__py3-none-any.whl → 0.93.3__py3-none-any.whl

nkululeko/constants.py

@@ -1,2 +1,2 @@
-VERSION="0.93.1"
+VERSION="0.93.3"
 SAMPLING_RATE = 16000

nkululeko/experiment.py

@@ -434,7 +434,9 @@ class Experiment:
                 f"unknown augmentation selection specifier {sample_selection},"
                 " should be [all | train | test]"
             )
-        targets = self.util.config_val_list("PREDICT", "targets", ["gender"])
+        targets = self.util.config_val_list("PREDICT", "targets", None)
+        if targets is None:
+            self.util.error("no prediction target specified")
         for target in targets:
             if target == "speaker":
                 from nkululeko.autopredict.ap_sid import SIDPredictor

nkululeko/plots.py

@@ -8,6 +8,8 @@ from scipy import stats
 import seaborn as sns
 from sklearn.manifold import TSNE
 
+from audmetric import concordance_cc as ccc
+
 import nkululeko.glob_conf as glob_conf
 from nkululeko.reporting.defines import Header
 from nkululeko.reporting.report_item import ReportItem
@@ -239,28 +241,54 @@ class Plots:
 
     def _plot2cont_cat(self, df, cont1, cont2, cat, ylab):
         """Plot relation of two continuous distributions with one categorical."""
+        if cont2 == "class_label":
+            df.rename(columns={cont2: self.target})
+            cont2 = self.target
+        if cont1 == "class_label":
+            df.rename(columns={cont1: self.target})
+            cont1 = self.target
+        if cat == "class_label":
+            df.rename(columns={cat: self.target})
+            cat = self.target
         pearson = stats.pearsonr(df[cont1], df[cont2])
         # trunc to three digits
         pearson = int(pearson[0] * 1000) / 1000
         pearson_string = f"PCC: {pearson}"
+        ccc_val = ccc(df[cont1], df[cont2])
+        ccc_val = int(ccc_val * 1000) / 1000
+        ccc_string = f"CCC: {ccc_val}"
         ax = sns.lmplot(data=df, x=cont1, y=cont2, hue=cat)
-        caption = f"{ylab} {df.shape[0]}. {pearson_string}"
+        caption = f"{ylab} {df.shape[0]}. {pearson_string} {ccc_string}"
         ax.figure.suptitle(caption)
         return ax, caption
 
     def _plot2cont(self, df, col1, col2, ylab):
         """Plot relation of two continuous distributions."""
+        # rename "class_label" to the original target
+        if col2 == "class_label":
+            df.rename(columns={col2: self.target})
+            col2 = self.target
+        if col1 == "class_label":
+            df.rename(columns={col1: self.target})
+            col1 = self.target
         pearson = stats.pearsonr(df[col1], df[col2])
         # trunc to three digits
         pearson = int(pearson[0] * 1000) / 1000
         pearson_string = f"PCC: {pearson}"
+        ccc_val = ccc(df[col1], df[col2])
+        ccc_val = int(ccc_val * 1000) / 1000
+        ccc_string = f"CCC: {ccc_val}"
         ax = sns.lmplot(data=df, x=col1, y=col2)
-        caption = f"{ylab} {df.shape[0]}. {pearson_string}"
+        caption = f"{ylab} {df.shape[0]}. {pearson_string} {ccc_string}"
         ax.figure.suptitle(caption)
         return ax, caption
 
     def plotcatcont(self, df, cat_col, cont_col, xlab, ylab):
         """Plot relation of categorical distribution with continuous."""
+        # rename "class_label" to the original target
+        if cat_col == "class_label":
+            df.rename(columns={cat_col: self.target})
+            cat_col = self.target
         dist_type = self.util.config_val("EXPL", "dist_type", "kde")
         cats, cat_str, es = su.get_effect_size(df, cat_col, cont_col)
         model_type = self.util.get_model_type()

nkululeko/utils/util.py

@@ -226,7 +226,10 @@ class Util:
         return self.config["DATA"]["target"]
 
     def get_model_type(self):
-        return self.config["MODEL"]["type"]
+        try:
+            return self.config["MODEL"]["type"]
+        except KeyError:
+            return ""
 
     def get_model_description(self):
         mt = ""

{nkululeko-0.93.1.dist-info → nkululeko-0.93.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nkululeko
-Version: 0.93.1
+Version: 0.93.3
 Summary: Machine learning audio prediction experiments based on templates
 Home-page: https://github.com/felixbur/nkululeko
 Author: Felix Burkhardt
@@ -355,6 +355,14 @@ If you use it, please mention the Nkululeko paper:
 Changelog
 =========
 
+Version 0.93.3
+--------------
+* bugfix in plot
+  
+Version 0.93.2
+--------------
+* changed class_label in plots to actual target
+
 Version 0.93.1
 --------------
 * made explore module more robust

{nkululeko-0.93.1.dist-info → nkululeko-0.93.3.dist-info}/RECORD

@@ -2,13 +2,13 @@ nkululeko/__init__.py,sha256=62f8HiEzJ8rG2QlTFJXUCMpvuH3fKI33DoJSj33mscc,63
 nkululeko/aug_train.py,sha256=FoMbBrfyOZd4QAw7oIHl3X6-UpsqAKWVDIolCA7qOWs,3196
 nkululeko/augment.py,sha256=3RzaxB3gRxovgJVjHXi0glprW01J7RaHhUkqotW2T3U,2955
 nkululeko/cacheddataset.py,sha256=XFpWZmbJRg0pvhnIgYf0TkclxllD-Fctu-Ol0PF_00c,969
-nkululeko/constants.py,sha256=-K1r-fO1ilOQ-FT2-YDWo37lCfB7mjYPEylDVqqcP_s,39
+nkululeko/constants.py,sha256=xkELXQg1phRJClie00O45xP9PEuZrgYAjtasyw7ugh4,39
 nkululeko/demo-ft.py,sha256=iD9Pzp9QjyAv31q1cDZ75vPez7Ve8A4Cfukv5yfZdrQ,770
 nkululeko/demo.py,sha256=4Yzhg6pCPBYPGJrP7JX2TysVosl_R1llpVDKc2P_gUA,4955
 nkululeko/demo_feats.py,sha256=BvZjeNFTlERIRlq34OHM4Z96jdDQAhB01BGQAUcX9dM,2026
 nkululeko/demo_predictor.py,sha256=lDF-xOxRdEAclOmbepAYg-BQXQdGkHfq2n74PTIoop8,4872
 nkululeko/ensemble.py,sha256=71V-rre61H3J4sh7lu-OTo4I2_g7mm_rQxwW1ARDHgY,12782
-nkululeko/experiment.py,sha256=G5yNFO3z8yGAXJYzZbA-ANAPU9tTtijVyOGG7NGsn2M,31701
+nkululeko/experiment.py,sha256=0xe_mrGtO6q8HF6dZ7slXca7BvSoyIh6j61U9mtcS_o,31785
 nkululeko/explore.py,sha256=FPM2CS-LKgcDV-LnjYlD6pEv7HuCQpH_C3KyyiOCdk4,3589
 nkululeko/export.py,sha256=U-V4acxtuL6qKt6oAsVcM5TTeWogYUJ3GU-lA6rq6d4,4336
 nkululeko/feature_extractor.py,sha256=UnspIWz3XrNhKnBBhWZkH2bHvD-sROtrQVqB1JvkUyw,4088
@@ -20,7 +20,7 @@ nkululeko/modelrunner.py,sha256=lJy-xM4QfDDWeL0dLTE_VIb4sYrnd_Z_yJRK3wwohQA,1119
 nkululeko/multidb.py,sha256=sO6OwJn8sn1-C-ig3thsIL8QMWHdV9SnJhDodKjeKrI,6876
 nkululeko/nkuluflag.py,sha256=PGWSmZz-PiiHLgcZJAoGOI_Y-sZDVI1ksB8p5r7riWM,3725
 nkululeko/nkululeko.py,sha256=M7baIq2nAoi6dEoBL4ATEuqAs5U1fvl_hyqAl5DybAQ,2040
-nkululeko/plots.py,sha256=dK3jVwsZufqXgHwAvDYt6uDg_KYk5cfxlP1Fo8kb9HA,23935
+nkululeko/plots.py,sha256=Qt81dEo0yW6Cms8prLv-qRerlSDaATYTPwjCxQpurdM,25076
 nkululeko/predict.py,sha256=MLnHEyFmSiHLLs-HDczag8Vu3zKF5T1rXLKdZZJ6py8,2083
 nkululeko/resample.py,sha256=akSAjJ3qn-O5NAyLJHVHdsK7MUZPGaZUvM2TwMSmj2M,5194
 nkululeko/runmanager.py,sha256=AswmORVUkCIH0gTx6zEyufvFATQBS8C5TXo2erSNdVg,7611
@@ -111,10 +111,10 @@ nkululeko/segmenting/seg_silero.py,sha256=ulodnvtRq5MLHDxy_RmAK4tJg6h1d-mPq-uCPF
 nkululeko/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nkululeko/utils/files.py,sha256=SrrYaU7AB80MZHiV1jcB0h_zigvYLYgSVNTXV4ao38g,4593
 nkululeko/utils/stats.py,sha256=vCRzhCR0Gx5SiJyAGbj1TIto8ocGz58CM5Pr3LltagA,2948
-nkululeko/utils/util.py,sha256=yxETonpbcGTeJhvdDr7sC4CO0Qtf-pgHEclZ76eOtPA,16816
-nkululeko-0.93.1.dist-info/LICENSE,sha256=0zGP5B_W35yAcGfHPS18Q2B8UhvLRY3dQq1MhpsJU_U,1076
-nkululeko-0.93.1.dist-info/METADATA,sha256=eLAEogu2sQxBrmzlxfHKs8AP2d9uELQLGhmIJ5sBWgk,42018
-nkululeko-0.93.1.dist-info/WHEEL,sha256=a7TGlA-5DaHMRrarXjVbQagU3Man_dCnGIWMJr5kRWo,91
-nkululeko-0.93.1.dist-info/entry_points.txt,sha256=lNTkFEdh6Kjo5o95ZAWf_0Lq-4ztGoAoMVSDuPtuyS0,442
-nkululeko-0.93.1.dist-info/top_level.txt,sha256=DPFNNSHPjUeVKj44dVANAjuVGRCC3MusJ08lc2a8xFA,10
-nkululeko-0.93.1.dist-info/RECORD,,
+nkululeko/utils/util.py,sha256=wFDslqxpCVDwi6LBakIFDDy1kYsxt5G7ykE38CocmtA,16880
+nkululeko-0.93.3.dist-info/LICENSE,sha256=0zGP5B_W35yAcGfHPS18Q2B8UhvLRY3dQq1MhpsJU_U,1076
+nkululeko-0.93.3.dist-info/METADATA,sha256=7yXY_U3k5TXa_ief57WrmWiLS7ov_FtviWCCH9LUoBg,42147
+nkululeko-0.93.3.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+nkululeko-0.93.3.dist-info/entry_points.txt,sha256=lNTkFEdh6Kjo5o95ZAWf_0Lq-4ztGoAoMVSDuPtuyS0,442
+nkululeko-0.93.3.dist-info/top_level.txt,sha256=DPFNNSHPjUeVKj44dVANAjuVGRCC3MusJ08lc2a8xFA,10
+nkululeko-0.93.3.dist-info/RECORD,,

{nkululeko-0.93.1.dist-info → nkululeko-0.93.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.4.0)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py3-none-any