Refactored ISCO hierarchy creation and added hierarchical measures calculation

metric_template_1.py

@@ -96,8 +96,8 @@ class MetricTemplate1(evaluate.Metric):
         # Download and prepare the ISCO structure csv file
         isco_csv = dl_manager.download_and_extract(ISCO_HIERARCHY_URL)
         print(f"ISCO CSV file downloaded")
-        self.isco_hierarchy = isco.create_hierarchy(isco_csv)
-        print("ISCO hierarchy created")
+        self.isco_hierarchy = isco.create_hierarchy_dict(isco_csv)
+        print("ISCO hierarchy dictionary created")
         print(self.isco_hierarchy)
 
     def _compute(self, predictions, references):
@@ -118,8 +118,11 @@ class MetricTemplate1(evaluate.Metric):
         # true_labels = [{'G'}]
         # predicted_labels = [{'F'}]
         hierarchy = self.isco_hierarchy
-        hP, hR = ham.hierarchical_precision_recall(references, predictions, hierarchy)
-        hF = ham.hierarchical_f_measure(hP, hR)
+        tree, code_to_node = isco.create_hierarchy_tree(hierarchy)
+        hP, hR, hF = ham.calculate_hierarchical_measures(
+            references, predictions, tree, code_to_node
+        )
+        # hF = ham.hierarchical_f_measure(hP, hR)
         print(
             f"Hierarchical Precision: {hP}, Hierarchical Recall: {hR}, Hierarchical F-measure: {hF}"
         )