Add: DCASE2024 evaluate classes and fns imports in init files.

Labbeti · Jun 25, 2024 · 0aa67ab · 0aa67ab
1 parent f3389e5
commit 0aa67ab
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/aac_metrics/__init__.py b/src/aac_metrics/__init__.py
@@ -21,6 +21,7 @@
 from .classes.cider_d import CIDErD
 from .classes.evaluate import (
     DCASE2023Evaluate,
+    DCASE2024Evaluate,
     Evaluate,
     _get_metric_factory_classes,
     _instantiate_metrics_classes,
@@ -35,7 +36,7 @@
 from .classes.spider_fl import SPIDErFL
 from .classes.spider_max import SPIDErMax
 from .classes.vocab import Vocab
-from .functional.evaluate import dcase2023_evaluate, evaluate
+from .functional.evaluate import dcase2023_evaluate, dcase2024_evaluate, evaluate
 from .utils.globals import (
     get_default_cache_path,
     get_default_java_path,
@@ -56,6 +57,7 @@
     "CIDErD",
     "Evaluate",
     "DCASE2023Evaluate",
+    "DCASE2024Evaluate",
     "FENSE",
     "FER",
     "METEOR",
@@ -68,6 +70,7 @@
     "Vocab",
     "evaluate",
     "dcase2023_evaluate",
+    "dcase2024_evaluate",
     "get_default_cache_path",
     "get_default_java_path",
     "get_default_tmp_path",

diff --git a/src/aac_metrics/classes/__init__.py b/src/aac_metrics/classes/__init__.py
@@ -4,7 +4,7 @@
 from .bert_score_mrefs import BERTScoreMRefs
 from .bleu import BLEU, BLEU1, BLEU2, BLEU3, BLEU4
 from .cider_d import CIDErD
-from .evaluate import DCASE2023Evaluate, Evaluate
+from .evaluate import DCASE2023Evaluate, DCASE2024Evaluate, Evaluate
 from .fense import FENSE
 from .fer import FER
 from .meteor import METEOR
@@ -16,7 +16,6 @@
 from .spider_max import SPIDErMax
 from .vocab import Vocab
 
-
 __all__ = [
     "BERTScoreMRefs",
     "BLEU",
@@ -26,6 +25,7 @@
     "BLEU4",
     "CIDErD",
     "DCASE2023Evaluate",
+    "DCASE2024Evaluate",
     "Evaluate",
     "FENSE",
     "FER",

diff --git a/src/aac_metrics/functional/__init__.py b/src/aac_metrics/functional/__init__.py
@@ -4,7 +4,7 @@
 from .bert_score_mrefs import bert_score_mrefs
 from .bleu import bleu, bleu_1, bleu_2, bleu_3, bleu_4
 from .cider_d import cider_d
-from .evaluate import dcase2023_evaluate, evaluate
+from .evaluate import dcase2023_evaluate, dcase2024_evaluate, evaluate
 from .fense import fense
 from .fer import fer
 from .meteor import meteor
@@ -16,7 +16,6 @@
 from .spider_max import spider_max
 from .vocab import vocab
 
-
 __all__ = [
     "bert_score_mrefs",
     "bleu",
@@ -26,6 +25,7 @@
     "bleu_4",
     "cider_d",
     "dcase2023_evaluate",
+    "dcase2024_evaluate",
     "evaluate",
     "fense",
     "fer",