From 48f14c6dad2ada99da1d4b35fab9ff847b970eed Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Sat, 12 Nov 2022 15:02:56 +0800 Subject: [PATCH] Parse [TANKS] --- api/s3_reservoirs.py | 4 ++-- api/s4_tanks.py | 46 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/api/s3_reservoirs.py b/api/s3_reservoirs.py index 7ba3f82..0904eb1 100644 --- a/api/s3_reservoirs.py +++ b/api/s3_reservoirs.py @@ -138,9 +138,9 @@ def inp_in_reservoir(section: list[str]) -> ChangeSet: return cs -def inp_out_junction(name: str) -> list[str]: +def inp_out_reservoir(name: str) -> list[str]: lines = [] - objs = read_all(name, 'select * from junctions') + objs = read_all(name, 'select * from reservoirs') for obj in objs: id = obj['id'] head = obj['head'] diff --git a/api/s4_tanks.py b/api/s4_tanks.py index cc57cb9..a6e1a16 100644 --- a/api/s4_tanks.py +++ b/api/s4_tanks.py @@ -142,3 +142,49 @@ def delete_tank_cache(name: str, cs: ChangeSet) -> SqlChangeSet: def delete_tank(name: str, cs: ChangeSet) -> ChangeSet: return execute_command(name, delete_tank_cache(name, cs)) + + +class InpTank: + def __init__(self, line: str) -> None: + tokens = line.split() + + num = len(tokens) + has_desc = tokens[-1].startswith(';') + num_without_desc = (num - 1) if has_desc else num + + self.id = str(tokens[0]) + self.elevation = float(tokens[1]) + self.init_level = float(tokens[2]) + self.min_level = float(tokens[3]) + self.max_level = float(tokens[4]) + self.diameter = float(tokens[5]) + self.min_vol = float(tokens[6]) + self.vol_curve = str(tokens[7]) if num_without_desc >= 8 else None + self.overflow = str(tokens[8]) if num_without_desc >= 9 else None + self.desc = str(tokens[-1]) if has_desc else None + + +def inp_in_tank(section: list[str]) -> ChangeSet: + cs = ChangeSet() + for s in section: + obj = InpTank(s) + cs.append({'operation': API_ADD, 'type': 'tank', 'id': obj.id, 'elevation': obj.elevation, 'init_level': obj.init_level, 'min_level': obj.min_level, 'max_level': obj.max_level, 'diameter': obj.diameter, 'min_vol': obj.min_vol, 'vol_curve': obj.vol_curve, 'overflow': obj.overflow}) + return cs + + +def inp_out_tank(name: str) -> list[str]: + lines = [] + objs = read_all(name, 'select * from tanks') + for obj in objs: + id = obj['id'] + elevation = obj['elevation'] + init_level = obj['init_level'] + min_level = obj['min_level'] + max_level = obj['max_level'] + diameter = obj['diameter'] + min_vol = obj['min_vol'] + vol_curve = obj['vol_curve'] if obj['vol_curve'] != None else '' + overflow = obj['overflow'] if obj['overflow'] != None else '' + desc = ';' + lines.append(f'{id} {elevation} {init_level} {min_level} {max_level} {diameter} {min_vol} {vol_curve} {overflow} {desc}') + return lines