OrgTJWater/TJWaterServer
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support option v3 inp in

Browse Source
This commit is contained in:
Joey Wang
2023-03-22 12:26:54 +08:00
parent e18c504067
commit faec3cef73
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/inp_in.py
View File

@@ -26,6 +26,7 @@ from .s20_mixing import inp_in_mixing
from .s21_times import inp_in_time from .s21_times import inp_in_time
from .s22_report import inp_in_report from .s22_report import inp_in_report
from .s23_options import inp_in_option from .s23_options import inp_in_option
from .s23_options_v3 import inp_in_option_v3
from .s24_coordinates import inp_in_coord from .s24_coordinates import inp_in_coord
from .s25_vertices import inp_in_vertex from .s25_vertices import inp_in_vertex
from .s26_labels import inp_in_label from .s26_labels import inp_in_label
@@ -156,7 +157,7 @@ def _get_file_offset(inp: str) -> tuple[dict[str, list[int]], bool]:
return (offset, demand_outside) return (offset, demand_outside)
def parse_file(project: str, inp: str) -> None: def parse_file(project: str, inp: str, version: str = '3') -> None:
start = _print_time(f'Start reading file "{inp}"...') start = _print_time(f'Start reading file "{inp}"...')
_print_time("First scan...") _print_time("First scan...")
@@ -232,6 +233,11 @@ def parse_file(project: str, inp: str) -> None:
if s == JUNCTIONS: if s == JUNCTIONS:
sql_batch.add(handler(line, demand_outside)) sql_batch.add(handler(line, demand_outside))
elif s == OPTIONS:
if version == '3':
sql_batch.add(inp_in_option_v3(line))
else:
sql_batch.add(inp_in_option(line))
else: else:
sql_batch.add(handler(line)) sql_batch.add(handler(line))
@@ -257,7 +263,7 @@ def read_inp(project: str, inp: str, version: str = '3') -> bool:
open_project(project) open_project(project)
try: try:
parse_file(project, inp) parse_file(project, inp, version)
except: except:
close_project(project) close_project(project)
delete_project(project) delete_project(project)
@@ -280,7 +286,7 @@ def import_inp(project: str, cs: ChangeSet, version: str = '3') -> bool:
f.write(str(cs.operations[0]['inp'])) f.write(str(cs.operations[0]['inp']))
_print_time(f'End writing temp file "{filename}"...') _print_time(f'End writing temp file "{filename}"...')
result = read_inp(project, filename) result = read_inp(project, filename, version)
os.remove(filename) os.remove(filename)