Progress on xml to son parser #5
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…Current code also saves output files on user's specified directory.
gonuke
requested changes
Nov 10, 2024
XML_to_SON/grammar_parser_test.py
Outdated
| @@ -137,28 +208,45 @@ def handle_choice_element(node): | |||
| def process_schema_from_mjson(xml_string, element_name): | |||
| root = ET.fromstring(xml_string) | |||
| processed_content = process_node(root) | |||
|
|
|||
| return {element_name: processed_content} | |||
|
|
|||
| def integrate_detailed_schemas(final_json, processed_facilities, processed_regions, processed_institutions): | |||
| for facility_name, facility_config in processed_facilities.items(): | |||
There was a problem hiding this comment.
Given all the repetition here, you could instead do:
for agent_type, agent_list in zip(['facility', 'institution', 'region'],
[processed_facilities, processed_instutitions, processed_regions]):
if agent_type in final_json["simulation"]:
for agent_name, agent_config in agent_list.items():
if agent_name in final_json["simulation"][agent_type]["config"]["ChildAtMostOne"]:
new_agent_config = {"InputTmpl": f'"{agent_name}", "MaxOccurs": 1}
new_agent_config.update(agent_config)
final_json["simulation"][agent_type]["config"][agent_name] = new_agent_config
XML_to_SON/grammar_parser_test.py
Outdated
| child_indent = base_indent + tab | ||
|
|
||
| matching_keys = [key for key in annotations.keys() if key.endswith(key_name)] | ||
| matching_keys = [key for key in annotations.keys() if key.split(":")[-2] == key_name.split("_")[-3] and key.split(":")[-1] == key_name.split("_")[-1]] |
There was a problem hiding this comment.
I think this will be more readable if we define the following with variables first:
key_name.split("_")[-3]key_name.split("_")[-1]
…as to reduce repetition.
|
Done! I reduced the repetition (very nice structure), and added variables to improve readability. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Improved automatic template generation for autocompletion mechanism. Current code also saves output files on user's specified directory.