# HG changeset patch # User francesco_lapi # Date 1722436966 0 # Node ID 2dbc0842124b6a957ce06fa7a7e4805475d90173 # Parent cb0df5dfc742586aba120a364a527854acbe35de Uploaded diff -r cb0df5dfc742 -r 2dbc0842124b marea_2/flux_to_map.py --- a/marea_2/flux_to_map.py Wed Jul 31 14:38:11 2024 +0000 +++ b/marea_2/flux_to_map.py Wed Jul 31 14:42:46 2024 +0000 @@ -878,9 +878,9 @@ # getMap will None-check the customPath and panic when the model IS custom but there's no file (good). A cleaner # solution can be derived from my comment in FilePath.fromStrPath - if ARGS.using_RAS: - ids, class_pat = getClassesAndIdsFromDatasets(ARGS.input_datas, ARGS.input_data, ARGS.input_class, ARGS.names) - computeEnrichment(core_map, class_pat, ids) + #if ARGS.using_RAS: + # ids, class_pat = getClassesAndIdsFromDatasets(ARGS.input_datas, ARGS.input_data, ARGS.input_class, ARGS.names) + # computeEnrichment(core_map, class_pat, ids) if ARGS.using_RPS: ids, class_pat = getClassesAndIdsFromDatasets(ARGS.input_datas_rps, ARGS.input_data_rps, ARGS.input_class_rps, ARGS.names_rps) @@ -889,15 +889,17 @@ # create output files: TODO: this is the same comparison happening in "maps", find a better way to organize this if ARGS.comparison == "manyvsmany": for i, j in it.combinations(class_pat.keys(), 2): createOutputMaps(i, j, core_map) + print('Execution succeded') return if ARGS.comparison == "onevsrest": for single_cluster in class_pat.keys(): createOutputMaps(single_cluster, "rest", core_map) + print('Execution succeded') return for otherDataset in class_pat.keys(): if otherDataset != ARGS.control: createOutputMaps(i, j, core_map) - print('Execution succeded') + if not ERRORS: return utils.logWarning( f"The following reaction IDs were mentioned in the dataset but weren't found in the map: {ERRORS}",