Refactor ISCO hierarchy creation and update metric calculation***

metric_template_1.py

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