From 53ffcb6e0fbfb651d606ce5e5e873c7f60d523b6 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 18 Nov 2022 21:58:58 +0800 Subject: [PATCH] Prioritize section parser --- api/api_parser.py | 38 ++++++++++++++++++++++++++++++++------ 1 file changed, 32 insertions(+), 6 deletions(-) diff --git a/api/api_parser.py b/api/api_parser.py index edd4afb..ad9fb51 100644 --- a/api/api_parser.py +++ b/api/api_parser.py @@ -171,11 +171,37 @@ def read_inp(project: str, inp: str): pass # :) cs = ChangeSet() - cs.merge(file_cs['PATTERNS']) - cs.merge(file_cs['CURVES']) - for s in section_name: - if s == 'PATTERNS' or s == 'CURVES': - continue + priorities = [ + 'PATTERNS', + 'CURVES', + 'JUNCTIONS', + 'RESERVOIRS', + 'TANKS', + 'COORDINATES', + 'PIPES', + 'PUMPS', + 'VALVES', + 'DEMANDS', + 'STATUS', + 'OPTIONS', + 'TIMES', + 'EMITTERS', + 'QUALITY', + 'SOURCES', + 'REACTIONS', + 'MIXING', + 'ENERGY', + 'REPORT', + 'VERTICES', + 'CONTROLS', + 'RULES', + 'TITLE', + 'TAGS', + 'LABELS', + 'BACKDROP', + 'END', + ] + for s in priorities: cs.merge(file_cs[s]) if is_project_open(project): @@ -187,7 +213,7 @@ def read_inp(project: str, inp: str): create_project(project) open_project(project) - execute_batch_command(project, cs) + execute_batch_commands(project, cs) def dump_inp(name: str, inp: str):