From 628258ef529d2483483bb87cd83d1789791b3265 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 1 Mar 2023 22:59:40 +0800 Subject: [PATCH 01/42] Drop demand & pattern from junction --- api/del_cmd_raw.py | 2 - api/parser.py | 6 +-- api/s2_junctions.py | 33 ++++------------ api/s9_demands.py | 65 ++++--------------------------- script/sql/create/2.junctions.sql | 2 - test_tjnetwork.py | 43 +------------------- 6 files changed, 18 insertions(+), 133 deletions(-) diff --git a/api/del_cmd_raw.py b/api/del_cmd_raw.py index 5531435..1953fda 100644 --- a/api/del_cmd_raw.py +++ b/api/del_cmd_raw.py @@ -3,7 +3,6 @@ from .sections import * from .s0_base import * -from .s2_junctions import unset_junction_by_pattern from .s3_reservoirs import unset_reservoir_by_pattern from .s4_tanks import unset_tank_by_curve from .s6_pumps import unset_pump_by_curve, unset_pump_by_pattern @@ -164,7 +163,6 @@ def delete_pattern_cascade_batch_cmd(name: str, cs: ChangeSet) -> ChangeSet: if row == None: return result - result.merge(unset_junction_by_pattern(name, id)) result.merge(unset_reservoir_by_pattern(name, id)) result.merge(unset_pump_by_pattern(name, id)) result.merge(unset_demand_by_pattern(name, id)) diff --git a/api/parser.py b/api/parser.py index e1d4324..296d75a 100644 --- a/api/parser.py +++ b/api/parser.py @@ -185,6 +185,8 @@ def _read_inp(file: dict[str, list[str]]) -> ChangeSet: coords = inp_in_coord(section) for s in ['JUNCTIONS', 'RESERVOIRS', 'TANKS']: for node in file_cs[s].operations: + if node['type'] == 'demand': + continue if node['id'] in coords: coord = coords[node['id']] node |= { 'x' : coord['x'], 'y' : coord['y'] } @@ -204,10 +206,6 @@ def _read_inp(file: dict[str, list[str]]) -> ChangeSet: elif name == 'END': pass # :) - # if demand section is empty, fill it with junction data - demands_cs = fill_demand(file_cs['JUNCTIONS'], file_cs['DEMANDS']) - file_cs['DEMANDS'].merge(demands_cs) - # release file file = {} diff --git a/api/s2_junctions.py b/api/s2_junctions.py index c14677e..5c034fb 100644 --- a/api/s2_junctions.py +++ b/api/s2_junctions.py @@ -8,8 +8,6 @@ def get_junction_schema(name: str) -> dict[str, dict[str, Any]]: 'x' : {'type': 'float' , 'optional': False , 'readonly': False}, 'y' : {'type': 'float' , 'optional': False , 'readonly': False}, 'elevation' : {'type': 'float' , 'optional': False , 'readonly': False}, - 'demand' : {'type': 'float' , 'optional': True , 'readonly': False}, - 'pattern' : {'type': 'str' , 'optional': True , 'readonly': False}, 'links' : {'type': 'str_list' , 'optional': False , 'readonly': True } } @@ -21,8 +19,6 @@ def get_junction(name: str, id: str) -> dict[str, Any]: d['x'] = float(xy['x']) d['y'] = float(xy['y']) d['elevation'] = float(j['elevation']) - d['demand'] = float(j['demand']) if j['demand'] != None else None - d['pattern'] = str(j['pattern']) if j['pattern'] != None else None d['links'] = get_node_links(name, id) return d @@ -34,18 +30,14 @@ class Junction(object): self.x = float(input['x']) self.y = float(input['y']) self.elevation = float(input['elevation']) - self.demand = float(input['demand']) if 'demand' in input and input['demand'] != None else None - self.pattern = str(input['pattern']) if 'pattern' in input and input['pattern'] != None else None self.f_type = f"'{self.type}'" self.f_id = f"'{self.id}'" self.f_coord = f"'({self.x}, {self.y})'" self.f_elevation = self.elevation - self.f_demand = self.demand if self.demand != None else 'null' - self.f_pattern = f"'{self.pattern}'" if self.pattern != None else 'null' def as_dict(self) -> dict[str, Any]: - return { 'type': self.type, 'id': self.id, 'x': self.x, 'y': self.y, 'elevation': self.elevation, 'demand': self.demand, 'pattern': self.pattern } + return { 'type': self.type, 'id': self.id, 'x': self.x, 'y': self.y, 'elevation': self.elevation } def as_id_dict(self) -> dict[str, Any]: return { 'type': self.type, 'id': self.id } @@ -62,11 +54,11 @@ def set_junction_cmd(name: str, cs: ChangeSet) -> DbChangeSet: raw_new[key] = new_dict[key] new = Junction(raw_new) - redo_sql = f"update junctions set elevation = {new.f_elevation}, demand = {new.f_demand}, pattern = {new.f_pattern} where id = {new.f_id};" + redo_sql = f"update junctions set elevation = {new.f_elevation} where id = {new.f_id};" redo_sql += f"\nupdate coordinates set coord = {new.f_coord} where node = {new.f_id};" undo_sql = f"update coordinates set coord = {old.f_coord} where node = {old.f_id};" - undo_sql += f"\nupdate junctions set elevation = {old.f_elevation}, demand = {old.f_demand}, pattern = {old.f_pattern} where id = {old.f_id};" + undo_sql += f"\nupdate junctions set elevation = {old.f_elevation} where id = {old.f_id};" redo_cs = g_update_prefix | new.as_dict() undo_cs = g_update_prefix | old.as_dict() @@ -82,7 +74,7 @@ def add_junction_cmd(name: str, cs: ChangeSet) -> DbChangeSet: new = Junction(cs.operations[0]) redo_sql = f"insert into _node (id, type) values ({new.f_id}, {new.f_type});" - redo_sql += f"\ninsert into junctions (id, elevation, demand, pattern) values ({new.f_id}, {new.f_elevation}, {new.f_demand}, {new.f_pattern});" + redo_sql += f"\ninsert into junctions (id, elevation) values ({new.f_id}, {new.f_elevation});" redo_sql += f"\ninsert into coordinates (node, coord) values ({new.f_id}, {new.f_coord});" undo_sql = f"delete from coordinates where node = {new.f_id};" @@ -107,7 +99,7 @@ def delete_junction_cmd(name: str, cs: ChangeSet) -> DbChangeSet: redo_sql += f"\ndelete from _node where id = {old.f_id};" undo_sql = f"insert into _node (id, type) values ({old.f_id}, {old.f_type});" - undo_sql += f"\ninsert into junctions (id, elevation, demand, pattern) values ({old.f_id}, {old.f_elevation}, {old.f_demand}, {old.f_pattern});" + undo_sql += f"\ninsert into junctions (id, elevation) values ({old.f_id}, {old.f_elevation});" undo_sql += f"\ninsert into coordinates (node, coord) values ({old.f_id}, {old.f_coord});" redo_cs = g_delete_prefix | old.as_id_dict() @@ -150,6 +142,7 @@ def inp_in_junction(section: list[str]) -> ChangeSet: continue obj = InpJunction(s) cs.append(g_add_prefix | {'type': 'junction', 'id': obj.id, 'elevation': obj.elevation, 'demand': obj.demand, 'pattern': obj.pattern}) + cs.append(g_update_prefix | { 'type': 'demand', 'junction': obj.id, 'demands': [{'demand': obj.demand, 'pattern': obj.pattern, 'category': None}] }) return cs @@ -159,18 +152,6 @@ def inp_out_junction(name: str) -> list[str]: for obj in objs: id = obj['id'] elev = obj['elevation'] - demand = obj['demand'] if obj['demand'] != None else '' - pattern = obj['pattern'] if obj['pattern'] != None else '' desc = ';' - lines.append(f'{id} {elev} {demand} {pattern} {desc}') + lines.append(f'{id} {elev} {desc}') return lines - - -def unset_junction_by_pattern(name: str, pattern: str) -> ChangeSet: - cs = ChangeSet() - - rows = read_all(name, f"select id from junctions where pattern = '{pattern}'") - for row in rows: - cs.append(g_update_prefix | {'type': 'junction', 'id': row['id'], 'pattern': None}) - - return cs diff --git a/api/s9_demands.py b/api/s9_demands.py index 355b4fe..a90e046 100644 --- a/api/s9_demands.py +++ b/api/s9_demands.py @@ -1,5 +1,4 @@ from .database import * -from .s2_junctions import * def get_demand_schema(name: str) -> dict[str, dict[str, Any]]: return { 'junction' : {'type': 'str' , 'optional': False , 'readonly': True }, @@ -40,7 +39,7 @@ def set_demand_cmd(name: str, cs: ChangeSet) -> DbChangeSet: redo_sql += f"\ninsert into demands (junction, demand, pattern, category) values ({f_junction}, {f_demand}, {f_pattern}, {f_category});" new['demands'].append({ 'demand': demand, 'pattern': pattern, 'category': category }) - _undo_sql = f"delete from demands where junction = {f_junction};" + undo_sql = f"delete from demands where junction = {f_junction};" for r in old['demands']: demand = float(r['demand']) pattern = str(r['pattern']) if 'pattern' in r and r['pattern'] != None else None @@ -48,37 +47,12 @@ def set_demand_cmd(name: str, cs: ChangeSet) -> DbChangeSet: f_demand = demand f_pattern = f"'{pattern}'" if pattern != None else 'null' f_category = f"'{category}'" if category != None else 'null' - _undo_sql += f"\ninsert into demands (junction, demand, pattern, category) values ({f_junction}, {f_demand}, {f_pattern}, {f_category});" + undo_sql += f"\ninsert into demands (junction, demand, pattern, category) values ({f_junction}, {f_demand}, {f_pattern}, {f_category});" - redo_cs = [] - redo_cs.append(g_update_prefix | { 'type': 'demand' } | new) - undo_cs = [] - undo_cs.append(g_update_prefix | { 'type': 'demand' } | old) + redo_cs = g_update_prefix | { 'type': 'demand' } | new + undo_cs = g_update_prefix | { 'type': 'demand' } | old - cmd = None - if len(cs.operations[0]['demands']) > 0: - r = cs.operations[0]['demands'][0] - demand = float(r['demand']) - pattern = str(r['pattern']) if 'pattern' in r and r['pattern'] != None else None - cmd = set_junction_cmd(name, ChangeSet({'id': junction, 'demand': demand, 'pattern': pattern})) - else: - cmd = set_junction_cmd(name, ChangeSet({'id': junction, 'demand': None, 'pattern': None})) - - undo_sql = '' - if cmd != None: - redo_sql += '\n' - redo_sql += cmd.redo_sql - - undo_sql += cmd.undo_sql - undo_sql += '\n' - undo_sql += _undo_sql - - redo_cs += cmd.redo_cs - - undo_cs += cmd.undo_cs - undo_cs.reverse() - - return DbChangeSet(redo_sql, undo_sql, redo_cs, undo_cs) + return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) def set_demand(name: str, cs: ChangeSet) -> ChangeSet: @@ -123,29 +97,6 @@ def inp_in_demand(section: list[str]) -> ChangeSet: return cs -def fill_demand(junction_cs : ChangeSet, demand_cs : ChangeSet) -> ChangeSet: - cs = ChangeSet() - - for j_cs in junction_cs.operations: - if 'demand' not in j_cs: - continue - - in_demand = False - for d_cs in demand_cs.operations: - if j_cs['id'] == d_cs['junction']: - in_demand = True - break - - if not in_demand: - obj_cs : dict[str, Any] = g_update_prefix | {'type': 'demand', 'junction' : j_cs['id'], 'demands' : []} - j_demand = j_cs['demand'] - j_pattern = j_cs['pattern'] if 'pattern' in j_cs else None - obj_cs['demands'].append({'demand': j_demand, 'pattern' : j_pattern, 'category': None}) - cs.append(obj_cs) - - return cs - - def inp_out_demand(name: str) -> list[str]: lines = [] objs = read_all(name, f"select * from demands order by _order") @@ -168,11 +119,11 @@ def delete_demand_by_junction(name: str, junction: str) -> ChangeSet: def unset_demand_by_pattern(name: str, pattern: str) -> ChangeSet: cs = ChangeSet() - rows = read_all(name, f"select distinct id from junctions where pattern = '{pattern}'") + rows = read_all(name, f"select distinct junction from demands where pattern = '{pattern}'") for row in rows: - ds = get_demand(name, row['id']) + ds = get_demand(name, row['junction']) for d in ds['demands']: d['pattern'] = None - cs.append(g_update_prefix | {'type': 'demand', 'junction': row['id'], 'demands': ds['demands']}) + cs.append(g_update_prefix | {'type': 'demand', 'junction': row['junction'], 'demands': ds['demands']}) return cs diff --git a/script/sql/create/2.junctions.sql b/script/sql/create/2.junctions.sql index 85e71fc..fd09e4b 100644 --- a/script/sql/create/2.junctions.sql +++ b/script/sql/create/2.junctions.sql @@ -4,8 +4,6 @@ create table junctions ( id varchar(32) primary key references _node(id) , elevation numeric not null -, demand numeric -, pattern varchar(32) references _pattern(id) ); -- unset pattern when delete pattern diff --git a/test_tjnetwork.py b/test_tjnetwork.py index 6f05844..322530c 100644 --- a/test_tjnetwork.py +++ b/test_tjnetwork.py @@ -254,8 +254,6 @@ class TestApi: assert j0['x'] == 0.0 assert j0['y'] == 10.0 assert j0['elevation'] == 20.0 - assert j0['demand'] == None - assert j0['pattern'] == None assert j0['links'] == [] set_junction(p, ChangeSet({'id': 'j0', 'x': 100.0, 'y': 200.0})) @@ -267,10 +265,6 @@ class TestApi: j0 = get_junction(p, 'j0') assert j0['elevation'] == 100.0 - set_junction(p, ChangeSet({'id': 'j0', 'demand': 100.0})) - j0 = get_junction(p, 'j0') - assert j0['demand'] == 100.0 - # TODO: pattern add_junction(p, ChangeSet({'id': 'j1', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) @@ -314,8 +308,6 @@ class TestApi: assert cs['x'] == 0.0 assert cs['y'] == 10.0 assert cs['elevation'] == 20.0 - assert cs['demand'] == None - assert cs['pattern'] == None cs = execute_undo(p).operations[0] assert cs['operation'] == 'delete' @@ -329,8 +321,6 @@ class TestApi: assert cs['x'] == 0.0 assert cs['y'] == 10.0 assert cs['elevation'] == 20.0 - assert cs['demand'] == None - assert cs['pattern'] == None cs = execute_undo(p, True).operations[0] assert cs['operation'] == 'delete' @@ -360,8 +350,6 @@ class TestApi: assert cs['x'] == 0.0 assert cs['y'] == 10.0 assert cs['elevation'] == 20.0 - assert cs['demand'] == 100.0 - assert cs['pattern'] == None cs = execute_redo(p).operations[0] assert cs['operation'] == 'delete' @@ -375,8 +363,6 @@ class TestApi: assert cs['x'] == 0.0 assert cs['y'] == 10.0 assert cs['elevation'] == 20.0 - assert cs['demand'] == 100.0 - assert cs['pattern'] == None cs = execute_redo(p) assert len(cs.operations) == 0 @@ -391,8 +377,6 @@ class TestApi: assert cs['x'] == 100.0 assert cs['y'] == 200.0 assert cs['elevation'] == 20.0 - assert cs['demand'] == 100.0 - assert cs['pattern'] == None cs = execute_undo(p).operations[0] assert cs['operation'] == 'update' @@ -401,8 +385,6 @@ class TestApi: assert cs['x'] == 0.0 assert cs['y'] == 10.0 assert cs['elevation'] == 20.0 - assert cs['demand'] == 100.0 - assert cs['pattern'] == None self.leave(p) @@ -1699,12 +1681,8 @@ class TestApi: assert ds[1]['pattern'] == None assert ds[1]['category'] == None - assert get_junction(p, 'j1')['demand'] == 10.0 - set_demand(p, ChangeSet({'junction': 'j1', 'demands': []})) - assert get_junction(p, 'j1')['demand'] == None - d = get_demand(p, 'j1') assert d['junction'] == 'j1' assert d['demands'] == [] @@ -1733,20 +1711,10 @@ class TestApi: assert ds[1]['demand'] == 20.0 assert ds[1]['pattern'] == None assert ds[1]['category'] == None - cs = result.operations[1] - assert cs['operation'] == API_UPDATE - assert cs['type'] == JUNCTION - assert cs['id'] == 'j1' - assert cs['demand'] == 10.0 result = execute_undo(p) cs = result.operations[0] assert cs['operation'] == API_UPDATE - assert cs['type'] == JUNCTION - assert cs['id'] == 'j1' - assert cs['demand'] == None - cs = result.operations[1] - assert cs['operation'] == API_UPDATE assert cs['type'] == 'demand' assert cs['junction'] == 'j1' assert len(cs['demands']) == 0 @@ -1764,11 +1732,6 @@ class TestApi: assert ds[1]['demand'] == 20.0 assert ds[1]['pattern'] == None assert ds[1]['category'] == None - cs = result.operations[1] - assert cs['operation'] == API_UPDATE - assert cs['type'] == JUNCTION - assert cs['id'] == 'j1' - assert cs['demand'] == 10.0 self.leave(p) @@ -1971,14 +1934,13 @@ class TestApi: self.enter(p) add_pattern(p, ChangeSet({'id' : 'p0', 'factors': [1.0, 2.0, 3.0]})) - add_junction(p, ChangeSet({'id': 'j0', 'x': 0.0, 'y': 10.0, 'elevation': 20.0, 'pattern': 'p0'})) + add_junction(p, ChangeSet({'id': 'j0', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) add_reservoir(p, ChangeSet({'id': 'r0', 'x': 0.0, 'y': 10.0, 'head': 20.0, 'pattern': 'p0'})) add_pump(p, ChangeSet({'id': 'pump0', 'node1': 'j0', 'node2': 'r0', 'power': 0.0, 'pattern': 'p0'})) set_demand(p, ChangeSet({'junction': 'j0', 'demands': [{'demand': 10.0, 'pattern': 'p0', 'category': 'x'}, {'demand': 20.0, 'pattern': 'p0', 'category': None}]})) set_pump_energy(p, ChangeSet({'pump' : 'pump0', 'pattern': 'p0'})) add_source(p, ChangeSet({'node': 'j0', 's_type': SOURCE_TYPE_CONCEN, 'strength': 10.0, 'pattern': 'p0' })) assert is_pattern(p, 'p0') - assert get_junction(p, 'j0')['pattern'] == 'p0' assert get_reservoir(p, 'r0')['pattern'] == 'p0' assert get_pump(p, 'pump0')['pattern'] == 'p0' assert get_demand(p, 'j0')['demands'] == [{'demand': 10.0, 'pattern': 'p0', 'category': 'x'}, {'demand': 20.0, 'pattern': 'p0', 'category': None}] @@ -1987,7 +1949,6 @@ class TestApi: delete_pattern(p, ChangeSet({'id': 'p0'})) assert is_pattern(p, 'p0') == False - assert get_junction(p, 'j0')['pattern'] == None assert get_reservoir(p, 'r0')['pattern'] == None assert get_pump(p, 'pump0')['pattern'] == None assert get_demand(p, 'j0')['demands'] == [{'demand': 10.0, 'pattern': None, 'category': 'x'}, {'demand': 20.0, 'pattern': None, 'category': None}] @@ -1996,7 +1957,6 @@ class TestApi: execute_undo(p) assert is_pattern(p, 'p0') - assert get_junction(p, 'j0')['pattern'] == 'p0' assert get_reservoir(p, 'r0')['pattern'] == 'p0' assert get_pump(p, 'pump0')['pattern'] == 'p0' assert get_demand(p, 'j0')['demands'] == [{'demand': 10.0, 'pattern': 'p0', 'category': 'x'}, {'demand': 20.0, 'pattern': 'p0', 'category': None}] @@ -2005,7 +1965,6 @@ class TestApi: execute_redo(p) assert is_pattern(p, 'p0') == False - assert get_junction(p, 'j0')['pattern'] == None assert get_reservoir(p, 'r0')['pattern'] == None assert get_pump(p, 'pump0')['pattern'] == None assert get_demand(p, 'j0')['demands'] == [{'demand': 10.0, 'pattern': None, 'category': 'x'}, {'demand': 20.0, 'pattern': None, 'category': None}] From 3665e15c92e45432530da3a6db20c442092c54b1 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 1 Mar 2023 23:20:04 +0800 Subject: [PATCH 02/42] Setting of valve [GPV] should be string --- api/s7_valves.py | 12 ++++++------ script/sql/create/7.valves.sql | 2 +- test_tjnetwork.py | 28 ++++++++++++++-------------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/api/s7_valves.py b/api/s7_valves.py index ebf0bd0..8eb4fb3 100644 --- a/api/s7_valves.py +++ b/api/s7_valves.py @@ -16,7 +16,7 @@ def get_valve_schema(name: str) -> dict[str, dict[str, Any]]: 'node2' : {'type': 'str' , 'optional': False , 'readonly': False}, 'diameter' : {'type': 'float' , 'optional': False , 'readonly': False}, 'v_type' : {'type': 'str' , 'optional': False , 'readonly': False}, - 'setting' : {'type': 'float' , 'optional': False , 'readonly': False}, + 'setting' : {'type': 'str' , 'optional': False , 'readonly': False}, 'minor_loss' : {'type': 'float' , 'optional': False , 'readonly': False} } @@ -28,7 +28,7 @@ def get_valve(name: str, id: str) -> dict[str, Any]: d['node2'] = str(p['node2']) d['diameter'] = float(p['diameter']) d['v_type'] = str(p['type']) - d['setting'] = float(p['setting']) + d['setting'] = str(p['setting']) d['minor_loss'] = float(p['minor_loss']) return d @@ -41,7 +41,7 @@ class Valve(object): self.node2 = str(input['node2']) self.diameter = float(input['diameter']) self.v_type = str(input['v_type']) - self.setting = float(input['setting']) + self.setting = str(input['setting']) self.minor_loss = float(input['minor_loss']) self.f_type = f"'{self.type}'" @@ -50,7 +50,7 @@ class Valve(object): self.f_node2 = f"'{self.node2}'" self.f_diameter = self.diameter self.f_v_type = f"'{self.v_type}'" - self.f_setting = self.setting + self.f_setting = f"'{self.setting}'" self.f_minor_loss = self.minor_loss def as_dict(self) -> dict[str, Any]: @@ -126,7 +126,7 @@ def delete_valve(name: str, cs: ChangeSet) -> ChangeSet: # [EPANET2][IN][OUT] # id node1 node2 diam type setting (lcoeff lcurve) # for GPV, setting is string = head curve id -# for PCV, add loss curve if present +# [NOT SUPPORT] for PCV, add loss curve if present #-------------------------------------------------------------- class InpValve: def __init__(self, line: str) -> None: @@ -141,7 +141,7 @@ class InpValve: self.node2 = str(tokens[2]) self.diameter = float(tokens[3]) self.v_type = str(tokens[4].upper()) - self.setting = float(tokens[5]) + self.setting = str(tokens[5]) self.minor_loss = float(tokens[6]) self.desc = str(tokens[-1]) if has_desc else None diff --git a/script/sql/create/7.valves.sql b/script/sql/create/7.valves.sql index aab70ed..a815214 100644 --- a/script/sql/create/7.valves.sql +++ b/script/sql/create/7.valves.sql @@ -9,7 +9,7 @@ create table valves , node2 varchar(32) references _node(id) not null , diameter numeric not null , type valves_type not null -, setting numeric not null +, setting text not null , minor_loss numeric not null ); diff --git a/test_tjnetwork.py b/test_tjnetwork.py index 322530c..1730aed 100644 --- a/test_tjnetwork.py +++ b/test_tjnetwork.py @@ -1347,13 +1347,13 @@ class TestApi: assert is_junction(p, 'j3') assert is_junction(p, 'j4') - add_valve(p, ChangeSet({'id': 'v0', 'node1': 'j1', 'node2': 'j2', 'diameter': 10.0, 'v_type': VALVES_TYPE_FCV, 'setting': 0.1, 'minor_loss': 0.5 })) + add_valve(p, ChangeSet({'id': 'v0', 'node1': 'j1', 'node2': 'j2', 'diameter': 10.0, 'v_type': VALVES_TYPE_FCV, 'setting': '0.1', 'minor_loss': 0.5 })) v0 = get_valve(p, 'v0') assert v0['node1'] == 'j1' assert v0['node2'] == 'j2' assert v0['diameter'] == 10.0 assert v0['v_type'] == VALVES_TYPE_FCV - assert v0['setting'] == 0.1 + assert v0['setting'] == '0.1' assert v0['minor_loss'] == 0.5 set_valve(p, ChangeSet({'id': 'v0', 'node1': 'j3', 'node2': 'j4'})) @@ -1369,15 +1369,15 @@ class TestApi: v0 = get_valve(p, 'v0') assert v0['v_type'] == VALVES_TYPE_GPV - set_valve(p, ChangeSet({'id': 'v0', 'setting': 0.2})) + set_valve(p, ChangeSet({'id': 'v0', 'setting': '0.2'})) v0 = get_valve(p, 'v0') - assert v0['setting'] == 0.2 + assert v0['setting'] == '0.2' set_valve(p, ChangeSet({'id': 'v0', 'minor_loss': 0.1})) v0 = get_valve(p, 'v0') assert v0['minor_loss'] == 0.1 - add_valve(p, ChangeSet({'id': 'v1', 'node1': 'j1', 'node2': 'j2', 'diameter': 10.0, 'v_type': VALVES_TYPE_FCV, 'setting': 0.1, 'minor_loss': 0.5 })) + add_valve(p, ChangeSet({'id': 'v1', 'node1': 'j1', 'node2': 'j2', 'diameter': 10.0, 'v_type': VALVES_TYPE_FCV, 'setting': '0.1', 'minor_loss': 0.5 })) links = get_links(p) assert len(links) == 2 assert links[0] == 'v0' @@ -1410,7 +1410,7 @@ class TestApi: assert is_junction(p, 'j3') assert is_junction(p, 'j4') - cs = add_valve(p, ChangeSet({'id': 'v0', 'node1': 'j1', 'node2': 'j2', 'diameter': 10.0, 'v_type': VALVES_TYPE_FCV, 'setting': 0.1, 'minor_loss': 0.5 })).operations[0] + cs = add_valve(p, ChangeSet({'id': 'v0', 'node1': 'j1', 'node2': 'j2', 'diameter': 10.0, 'v_type': VALVES_TYPE_FCV, 'setting': '0.1', 'minor_loss': 0.5 })).operations[0] assert cs['operation'] == 'add' assert cs['type'] == VALVE assert cs['id'] == 'v0' @@ -1418,7 +1418,7 @@ class TestApi: assert cs['node2'] == 'j2' assert cs['diameter'] == 10.0 assert cs['v_type'] == VALVES_TYPE_FCV - assert cs['setting'] == 0.1 + assert cs['setting'] == '0.1' assert cs['minor_loss'] == 0.5 cs = execute_undo(p).operations[0] @@ -1434,7 +1434,7 @@ class TestApi: assert cs['node2'] == 'j2' assert cs['diameter'] == 10.0 assert cs['v_type'] == VALVES_TYPE_FCV - assert cs['setting'] == 0.1 + assert cs['setting'] == '0.1' assert cs['minor_loss'] == 0.5 cs = execute_undo(p, True).operations[0] @@ -1448,7 +1448,7 @@ class TestApi: links = get_links(p) assert len(links) == 0 - add_valve(p, ChangeSet({'id': 'v0', 'node1': 'j1', 'node2': 'j2', 'diameter': 10.0, 'v_type': VALVES_TYPE_FCV, 'setting': 0.1, 'minor_loss': 0.5 })) + add_valve(p, ChangeSet({'id': 'v0', 'node1': 'j1', 'node2': 'j2', 'diameter': 10.0, 'v_type': VALVES_TYPE_FCV, 'setting': '0.1', 'minor_loss': 0.5 })) links = get_links(p) assert len(links) == 1 @@ -1466,7 +1466,7 @@ class TestApi: assert cs['node2'] == 'j2' assert cs['diameter'] == 10.0 assert cs['v_type'] == VALVES_TYPE_FCV - assert cs['setting'] == 0.1 + assert cs['setting'] == '0.1' assert cs['minor_loss'] == 0.5 cs = execute_redo(p).operations[0] @@ -1482,7 +1482,7 @@ class TestApi: assert cs['node2'] == 'j2' assert cs['diameter'] == 10.0 assert cs['v_type'] == VALVES_TYPE_FCV - assert cs['setting'] == 0.1 + assert cs['setting'] == '0.1' assert cs['minor_loss'] == 0.5 cs = execute_redo(p) @@ -1499,7 +1499,7 @@ class TestApi: assert cs['node2'] == 'j4' assert cs['diameter'] == 10.0 assert cs['v_type'] == VALVES_TYPE_FCV - assert cs['setting'] == 0.1 + assert cs['setting'] == '0.1' assert cs['minor_loss'] == 0.5 cs = execute_undo(p).operations[0] @@ -1510,7 +1510,7 @@ class TestApi: assert cs['node2'] == 'j2' assert cs['diameter'] == 10.0 assert cs['v_type'] == VALVES_TYPE_FCV - assert cs['setting'] == 0.1 + assert cs['setting'] == '0.1' assert cs['minor_loss'] == 0.5 self.leave(p) @@ -1522,7 +1522,7 @@ class TestApi: add_junction(p, ChangeSet({'id': 'j0', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) add_junction(p, ChangeSet({'id': 'j1', 'x': 0.0, 'y': 10.0, 'elevation': 20.0})) - add_valve(p, ChangeSet({'id': 'v0', 'node1': 'j0', 'node2': 'j1', 'diameter': 10.0, 'v_type': VALVES_TYPE_FCV, 'setting': 0.1, 'minor_loss': 0.5 })) + add_valve(p, ChangeSet({'id': 'v0', 'node1': 'j0', 'node2': 'j1', 'diameter': 10.0, 'v_type': VALVES_TYPE_FCV, 'setting': '0.1', 'minor_loss': 0.5 })) set_tag(p, ChangeSet({'t_type': TAG_TYPE_LINK, 'id': 'v0', 'tag': 'v0t' })) set_status(p, ChangeSet({'link': 'v0', 'status': LINK_STATUS_OPEN, 'setting': 10.0})) set_vertex(p, ChangeSet({'link' : 'v0', 'coords': [{'x': 1.0, 'y': 2.0}, {'x': 2.0, 'y': 1.0}]})) From fa79522054c531d420292b05579c23c06fb1a278 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 1 Mar 2023 23:56:09 +0800 Subject: [PATCH 03/42] Supplement options --- api/__init__.py | 1 + api/s23_options.py | 102 ++++++++++++++++--------------- script/sql/create/23.options.sql | 28 +++++---- test_tjnetwork.py | 24 ++++++++ tjnetwork.py | 4 ++ 5 files changed, 96 insertions(+), 63 deletions(-) diff --git a/api/__init__.py b/api/__init__.py index 6789d7d..8be1cdf 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -90,6 +90,7 @@ from .s21_times import TIME_STATISTIC_NONE, TIME_STATISTIC_AVERAGED, TIME_STATIS from .s21_times import get_time_schema, get_time, set_time from .s23_options import OPTION_UNITS_CFS, OPTION_UNITS_GPM, OPTION_UNITS_MGD, OPTION_UNITS_IMGD, OPTION_UNITS_AFD, OPTION_UNITS_LPS, OPTION_UNITS_LPM, OPTION_UNITS_MLD, OPTION_UNITS_CMH, OPTION_UNITS_CMD +from .s23_options import OPTION_PRESSURE_PSI, OPTION_PRESSURE_KPA, OPTION_PRESSURE_M from .s23_options import OPTION_HEADLOSS_HW, OPTION_HEADLOSS_DW, OPTION_HEADLOSS_CM from .s23_options import OPTION_UNBALANCED_STOP, OPTION_UNBALANCED_CONTINUE from .s23_options import OPTION_DEMAND_MODEL_DDA, OPTION_DEMAND_MODEL_PDA diff --git a/api/s23_options.py b/api/s23_options.py index b62d61f..5f4dd99 100644 --- a/api/s23_options.py +++ b/api/s23_options.py @@ -11,13 +11,14 @@ OPTION_UNITS_MLD = 'MLD' OPTION_UNITS_CMH = 'CMH' OPTION_UNITS_CMD = 'CMD' +OPTION_PRESSURE_PSI = 'PSI' +OPTION_PRESSURE_KPA = 'KPA' +OPTION_PRESSURE_M = 'M' + OPTION_HEADLOSS_HW = 'H-W' OPTION_HEADLOSS_DW = 'D-W' OPTION_HEADLOSS_CM = 'C-M' -#OPTION_HYDRAULICS_USE = 'USE' -#OPTION_HYDRAULICS_SAVE = 'SAVE' - OPTION_UNBALANCED_STOP = 'STOP' OPTION_UNBALANCED_CONTINUE = 'CONTINUE' @@ -31,32 +32,34 @@ OPTION_QUALITY_TRACE = 'TRACE' element_schema = {'type': 'str' , 'optional': True , 'readonly': False} + def get_option_schema(name: str) -> dict[str, dict[str, Any]]: return { 'UNITS' : element_schema, + 'PRESSURE' : element_schema, 'HEADLOSS' : element_schema, - #'HYDRAULICS' : element_schema, + 'QUALITY' : element_schema, + 'UNBALANCED' : element_schema, + 'PATTERN' : element_schema, + 'DEMAND MODEL' : element_schema, + 'DEMAND MULTIPLIER' : element_schema, + 'EMITTER EXPONENT' : element_schema, 'VISCOSITY' : element_schema, + 'DIFFUSIVITY' : element_schema, 'SPECIFIC GRAVITY' : element_schema, 'TRIALS' : element_schema, 'ACCURACY' : element_schema, - 'FLOWCHANGE' : element_schema, 'HEADERROR' : element_schema, - 'CHECKFREQ' : element_schema, - 'MAXCHECK' : element_schema, - 'DAMPLIMIT' : element_schema, - 'UNBALANCED' : element_schema, - 'DEMAND MODEL' : element_schema, + 'FLOWCHANGE' : element_schema, 'MINIMUM PRESSURE' : element_schema, 'REQUIRED PRESSURE' : element_schema, 'PRESSURE EXPONENT' : element_schema, - 'PATTERN' : element_schema, - 'DEMAND MULTIPLIER' : element_schema, - 'EMITTER EXPONENT' : element_schema, - 'QUALITY' : element_schema, - 'DIFFUSIVITY' : element_schema, 'TOLERANCE' : element_schema, - #'MAP' : element_schema, - } + 'HTOL' : element_schema, + 'QTOL' : element_schema, + 'RQTOL' : element_schema, + 'CHECKFREQ' : element_schema, + 'MAXCHECK' : element_schema, + 'DAMPLIMIT' : element_schema } def get_option(name: str) -> dict[str, Any]: @@ -106,37 +109,36 @@ def set_option(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2] -# UNITS CFS/GPM/MGD/IMGD/AFD/LPS/LPM/MLD/CMH/CMD/SI -# PRESSURE PSI/KPA/M -# HEADLOSS H-W/D-W/C-M -# HYDRAULICS USE/SAVE filename -# QUALITY NONE/AGE/TRACE/CHEMICAL (TraceNode) -# MAP filename -# VERIFY filename -# UNBALANCED STOP/CONTINUE {Niter} -# PATTERN id -# DEMAND MODEL DDA/PDA -# DEMAND MULTIPLIER value -# EMITTER EXPONENT value -# VISCOSITY value -# DIFFUSIVITY value -# SPECIFIC GRAVITY value -# TRIALS value -# ACCURACY value# -# HEADERROR value -# FLOWCHANGE value -# MINIMUM PRESSURE value -# REQUIRED PRESSURE value -# PRESSURE EXPONENT value# -# TOLERANCE value -# ---- Undocumented Options ----- -# HTOL value -# QTOL value -# RQTOL value -# CHECKFREQ value -# MAXCHECK value -# DAMPLIMIT value +# [EPANET2][IN][OUT] +# UNITS CFS/GPM/MGD/IMGD/AFD/LPS/LPM/MLD/CMH/CMD/SI +# PRESSURE PSI/KPA/M +# HEADLOSS H-W/D-W/C-M +# QUALITY NONE/AGE/TRACE/CHEMICAL (TraceNode) +# UNBALANCED STOP/CONTINUE {Niter} +# PATTERN id +# DEMAND MODEL DDA/PDA +# DEMAND MULTIPLIER value +# EMITTER EXPONENT value +# VISCOSITY value +# DIFFUSIVITY value +# SPECIFIC GRAVITY value +# TRIALS value +# ACCURACY value# +# HEADERROR value +# FLOWCHANGE value +# MINIMUM PRESSURE value +# REQUIRED PRESSURE value +# PRESSURE EXPONENT value# +# TOLERANCE value +# HTOL value +# QTOL value +# RQTOL value +# CHECKFREQ value +# MAXCHECK value +# DAMPLIMIT value +# ---- Unsupported Options ----- +# HYDRAULICS USE/SAVE filename +# MAP filename #-------------------------------------------------------------- def inp_in_option(section: list[str]) -> ChangeSet: if len(section) > 0: @@ -146,9 +148,9 @@ def inp_in_option(section: list[str]) -> ChangeSet: continue tokens = s.strip().split() - if tokens[0].upper() == 'PATTERN': + if tokens[0].upper() == 'PATTERN': # can not upper id cs |= { 'PATTERN' : tokens[1] } - elif tokens[0].upper() == 'QUALITY': + elif tokens[0].upper() == 'QUALITY': # can not upper trace node value = tokens[1] if len(tokens) > 2: value += f' {tokens[2]}' diff --git a/script/sql/create/23.options.sql b/script/sql/create/23.options.sql index f88b536..732cb40 100644 --- a/script/sql/create/23.options.sql +++ b/script/sql/create/23.options.sql @@ -10,27 +10,29 @@ create table options insert into options (key, value) values ('UNITS', 'GPM') +, ('PRESSURE', 'PSI') , ('HEADLOSS', 'H-W') ---, ('HYDRAULICS', '') +, ('QUALITY', 'NONE') +, ('UNBALANCED', 'STOP') +, ('PATTERN', '1') +, ('DEMAND MODEL', 'DDA') +, ('DEMAND MULTIPLIER', '1.0') +, ('EMITTER EXPONENT', '0.5') , ('VISCOSITY', '1.0') +, ('DIFFUSIVITY', '1.0') , ('SPECIFIC GRAVITY', '1.0') , ('TRIALS', '40') , ('ACCURACY', '0.001') -, ('FLOWCHANGE', '0') , ('HEADERROR', '0') -, ('CHECKFREQ', '2') -, ('MAXCHECK', '10') -, ('DAMPLIMIT', '0') -, ('UNBALANCED', 'STOP') -, ('DEMAND MODEL', 'DDA') +, ('FLOWCHANGE', '0') , ('MINIMUM PRESSURE', '0') , ('REQUIRED PRESSURE', '0.1') , ('PRESSURE EXPONENT', '0.5') -, ('PATTERN', '1') -, ('DEMAND MULTIPLIER', '1.0') -, ('EMITTER EXPONENT', '0.5') -, ('QUALITY', 'NONE') -, ('DIFFUSIVITY', '1.0') , ('TOLERANCE', '0.01') ---, ('MAP', '') +, ('HTOL', '0.0005') +, ('QTOL', '0.0001') +, ('RQTOL', '0.0000001') +, ('CHECKFREQ', '2') +, ('MAXCHECK', '10') +, ('DAMPLIMIT', '0') ; diff --git a/test_tjnetwork.py b/test_tjnetwork.py index 1730aed..4bdb2c4 100644 --- a/test_tjnetwork.py +++ b/test_tjnetwork.py @@ -3251,6 +3251,10 @@ class TestApi: assert o['QUALITY'] == OPTION_QUALITY_NONE assert o['DIFFUSIVITY'] == '1.0' assert o['TOLERANCE'] == '0.01' + assert o['PRESSURE'] == OPTION_PRESSURE_PSI + assert o['HTOL'] == '0.0005' + assert o['QTOL'] == '0.0001' + assert o['RQTOL'] == '0.0000001' o['UNITS'] = OPTION_UNITS_LPS set_option(p, ChangeSet(o)) @@ -3278,6 +3282,10 @@ class TestApi: assert o['QUALITY'] == OPTION_QUALITY_NONE assert o['DIFFUSIVITY'] == '1.0' assert o['TOLERANCE'] == '0.01' + assert o['PRESSURE'] == OPTION_PRESSURE_PSI + assert o['HTOL'] == '0.0005' + assert o['QTOL'] == '0.0001' + assert o['RQTOL'] == '0.0000001' self.leave(p) @@ -3309,6 +3317,10 @@ class TestApi: assert o['QUALITY'] == OPTION_QUALITY_NONE assert o['DIFFUSIVITY'] == '1.0' assert o['TOLERANCE'] == '0.01' + assert o['PRESSURE'] == OPTION_PRESSURE_PSI + assert o['HTOL'] == '0.0005' + assert o['QTOL'] == '0.0001' + assert o['RQTOL'] == '0.0000001' o['UNITS'] = OPTION_UNITS_LPS cs = set_option(p, ChangeSet(o)).operations[0] @@ -3336,6 +3348,10 @@ class TestApi: assert cs['QUALITY'] == OPTION_QUALITY_NONE assert cs['DIFFUSIVITY'] == '1.0' assert cs['TOLERANCE'] == '0.01' + assert cs['PRESSURE'] == OPTION_PRESSURE_PSI + assert cs['HTOL'] == '0.0005' + assert cs['QTOL'] == '0.0001' + assert cs['RQTOL'] == '0.0000001' cs = execute_undo(p).operations[0] assert cs['operation'] == API_UPDATE @@ -3362,6 +3378,10 @@ class TestApi: assert cs['QUALITY'] == OPTION_QUALITY_NONE assert cs['DIFFUSIVITY'] == '1.0' assert cs['TOLERANCE'] == '0.01' + assert cs['PRESSURE'] == OPTION_PRESSURE_PSI + assert cs['HTOL'] == '0.0005' + assert cs['QTOL'] == '0.0001' + assert cs['RQTOL'] == '0.0000001' cs = execute_redo(p).operations[0] assert cs['operation'] == API_UPDATE @@ -3388,6 +3408,10 @@ class TestApi: assert cs['QUALITY'] == OPTION_QUALITY_NONE assert cs['DIFFUSIVITY'] == '1.0' assert cs['TOLERANCE'] == '0.01' + assert cs['PRESSURE'] == OPTION_PRESSURE_PSI + assert cs['HTOL'] == '0.0005' + assert cs['QTOL'] == '0.0001' + assert cs['RQTOL'] == '0.0000001' self.leave(p) diff --git a/tjnetwork.py b/tjnetwork.py index 78417f4..cac960e 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -80,6 +80,10 @@ OPTION_UNITS_MLD = api.OPTION_UNITS_MLD OPTION_UNITS_CMH = api.OPTION_UNITS_CMH OPTION_UNITS_CMD = api.OPTION_UNITS_CMD +OPTION_PRESSURE_PSI = api.OPTION_PRESSURE_PSI +OPTION_PRESSURE_KPA = api.OPTION_PRESSURE_KPA +OPTION_PRESSURE_M = api.OPTION_PRESSURE_M + OPTION_HEADLOSS_HW = api.OPTION_HEADLOSS_HW OPTION_HEADLOSS_DW = api.OPTION_HEADLOSS_DW OPTION_HEADLOSS_CM = api.OPTION_HEADLOSS_CM From 013a86ac3a683838c26e29c6ebe1fdb74731ce25 Mon Sep 17 00:00:00 2001 From: Joey Wang Date: Thu, 2 Mar 2023 12:55:47 +0800 Subject: [PATCH 04/42] Remove redundant comment --- script/sql/create/2.junctions.sql | 2 -- 1 file changed, 2 deletions(-) diff --git a/script/sql/create/2.junctions.sql b/script/sql/create/2.junctions.sql index fd09e4b..b164d2a 100644 --- a/script/sql/create/2.junctions.sql +++ b/script/sql/create/2.junctions.sql @@ -5,5 +5,3 @@ create table junctions id varchar(32) primary key references _node(id) , elevation numeric not null ); - --- unset pattern when delete pattern From d514439bd2eeef4abd4cbffe6b1eea51882ee9d5 Mon Sep 17 00:00:00 2001 From: Joey Wang Date: Thu, 2 Mar 2023 13:28:04 +0800 Subject: [PATCH 05/42] Relax tank read limitation --- api/s4_tanks.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/api/s4_tanks.py b/api/s4_tanks.py index 53388f0..5c5c88d 100644 --- a/api/s4_tanks.py +++ b/api/s4_tanks.py @@ -145,10 +145,13 @@ def delete_tank(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPANET2] +# [IN] # id elev initlevel minlevel maxlevel diam (minvol vcurve overflow) ;desc # xxx # * YES +# [OUT] +# id elev initlevel minlevel maxlevel diam minvol (vcurve overflow) ;desc #-------------------------------------------------------------- class InpTank: def __init__(self, line: str) -> None: @@ -164,7 +167,7 @@ class InpTank: self.min_level = float(tokens[3]) self.max_level = float(tokens[4]) self.diameter = float(tokens[5]) - self.min_vol = float(tokens[6]) + self.min_vol = float(tokens[6]) if num_without_desc >= 7 else 0.0 self.vol_curve = str(tokens[7]) if num_without_desc >= 8 and tokens[7] != '*' else None self.overflow = str(tokens[8].upper()) if num_without_desc >= 9 else None self.desc = str(tokens[-1]) if has_desc else None From b2431d4ed983473fc9b9195c23a64baf094706d4 Mon Sep 17 00:00:00 2001 From: Joey Wang Date: Thu, 2 Mar 2023 19:20:20 +0800 Subject: [PATCH 06/42] Add EPANET3 format --- api/s2_junctions.py | 8 +++++++- api/s3_reservoirs.py | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/api/s2_junctions.py b/api/s2_junctions.py index 5c034fb..860da1a 100644 --- a/api/s2_junctions.py +++ b/api/s2_junctions.py @@ -113,12 +113,18 @@ def delete_junction(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2] +# [EPA2] # [IN] # id elev. (demand) (demand pattern) ;desc # [OUT] # id elev. ;desc #-------------------------------------------------------------- +# [EPA3] +# [IN] +# id elev. (demand) (demand pattern) +# [OUT] +# id elev. * * minpressure fullpressure +#-------------------------------------------------------------- class InpJunction: def __init__(self, line: str) -> None: tokens = line.split() diff --git a/api/s3_reservoirs.py b/api/s3_reservoirs.py index 0235a8e..3a9760a 100644 --- a/api/s3_reservoirs.py +++ b/api/s3_reservoirs.py @@ -117,7 +117,7 @@ def delete_reservoir(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][EPA3][IN][OUT] # id elev (pattern) ;desc #-------------------------------------------------------------- class InpReservoir: From 844e86b34dc07460c769699292402ce057e7f80c Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 2 Mar 2023 19:43:10 +0800 Subject: [PATCH 07/42] Add EPANET3 format --- api/s16_emitters.py | 5 ++++- api/s17_quality.py | 2 +- api/s18_sources.py | 2 +- api/s19_reactions.py | 2 +- api/s20_mixing.py | 3 ++- api/s24_coordinates.py | 2 +- api/s4_tanks.py | 5 ++++- api/s9_demands.py | 2 +- 8 files changed, 15 insertions(+), 8 deletions(-) diff --git a/api/s16_emitters.py b/api/s16_emitters.py index 751782d..844a3fc 100644 --- a/api/s16_emitters.py +++ b/api/s16_emitters.py @@ -60,9 +60,12 @@ def set_emitter(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][IN][OUT] # node Ke #-------------------------------------------------------------- +# [EPA3][IN][OUT] +# node Ke (exponent pattern) +#-------------------------------------------------------------- class InpEmitter: def __init__(self, line: str) -> None: tokens = line.split() diff --git a/api/s17_quality.py b/api/s17_quality.py index 620e8d5..faf30fe 100644 --- a/api/s17_quality.py +++ b/api/s17_quality.py @@ -60,7 +60,7 @@ def set_quality(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][EPA3][IN][OUT] # node initqual #-------------------------------------------------------------- class InpQuality: diff --git a/api/s18_sources.py b/api/s18_sources.py index 47d8797..9c1e210 100644 --- a/api/s18_sources.py +++ b/api/s18_sources.py @@ -103,7 +103,7 @@ def delete_source(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][EPA3][IN][OUT] # node sourcetype quality (pattern) #-------------------------------------------------------------- class InpSource: diff --git a/api/s19_reactions.py b/api/s19_reactions.py index 859d63c..5c9117a 100644 --- a/api/s19_reactions.py +++ b/api/s19_reactions.py @@ -182,7 +182,7 @@ def set_tank_reaction(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][EPA3][IN][OUT] # ORDER {BULK/WALL/TANK} value # GLOBAL BULK coeff # GLOBAL WALL coeff diff --git a/api/s20_mixing.py b/api/s20_mixing.py index cd1d52d..1a9704c 100644 --- a/api/s20_mixing.py +++ b/api/s20_mixing.py @@ -97,8 +97,9 @@ def delete_mixing(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][EPA3][IN][OUT] # TankID MixModel FractVolume +# FractVolume if type == MIX2 #-------------------------------------------------------------- class InpMixing: def __init__(self, line: str) -> None: diff --git a/api/s24_coordinates.py b/api/s24_coordinates.py index 44cd2cd..aa30517 100644 --- a/api/s24_coordinates.py +++ b/api/s24_coordinates.py @@ -12,7 +12,7 @@ def get_node_coord(name: str, id: str) -> dict[str, float]: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][EPA3][IN][OUT] # id x y #-------------------------------------------------------------- # exception ! need merge to node change set ! diff --git a/api/s4_tanks.py b/api/s4_tanks.py index 5c5c88d..ad92d8f 100644 --- a/api/s4_tanks.py +++ b/api/s4_tanks.py @@ -145,7 +145,7 @@ def delete_tank(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2] +# [EPA2] # [IN] # id elev initlevel minlevel maxlevel diam (minvol vcurve overflow) ;desc # xxx @@ -153,6 +153,9 @@ def delete_tank(name: str, cs: ChangeSet) -> ChangeSet: # [OUT] # id elev initlevel minlevel maxlevel diam minvol (vcurve overflow) ;desc #-------------------------------------------------------------- +# [EPA3] +# id elev initlevel minlevel maxlevel diam minvol (vcurve) +#-------------------------------------------------------------- class InpTank: def __init__(self, line: str) -> None: tokens = line.split() diff --git a/api/s9_demands.py b/api/s9_demands.py index a90e046..2fedb1e 100644 --- a/api/s9_demands.py +++ b/api/s9_demands.py @@ -60,7 +60,7 @@ def set_demand(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][EPA3][IN][OUT] # node base_demand (pattern) ;category #-------------------------------------------------------------- class InpDemand: From 2f395986c379b246d5f3de139c61a3a34bbfd6c7 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 2 Mar 2023 19:51:24 +0800 Subject: [PATCH 08/42] Add EPANET3 format --- api/s10_status.py | 2 +- api/s15_energy.py | 2 +- api/s5_pipes.py | 2 +- api/s6_pumps.py | 2 +- api/s7_valves.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/s10_status.py b/api/s10_status.py index c103635..07d1f50 100644 --- a/api/s10_status.py +++ b/api/s10_status.py @@ -69,7 +69,7 @@ def set_status(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][EPA3][IN][OUT] # link value #-------------------------------------------------------------- class InpStatus: diff --git a/api/s15_energy.py b/api/s15_energy.py index cb8fab1..8b7551c 100644 --- a/api/s15_energy.py +++ b/api/s15_energy.py @@ -132,7 +132,7 @@ def set_pump_energy(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][EPA3][IN][OUT] # GLOBAL {PRICE/PATTERN/EFFIC} value # PUMP id {PRICE/PATTERN/EFFIC} value # DEMAND CHARGE value diff --git a/api/s5_pipes.py b/api/s5_pipes.py index dd8b954..f7c05b8 100644 --- a/api/s5_pipes.py +++ b/api/s5_pipes.py @@ -124,7 +124,7 @@ def delete_pipe(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2] +# [EPA2][EPA3] # [IN] # id node1 node2 length diam rcoeff (lcoeff status) ;desc # [OUT] diff --git a/api/s6_pumps.py b/api/s6_pumps.py index acef09e..aa2071f 100644 --- a/api/s6_pumps.py +++ b/api/s6_pumps.py @@ -115,7 +115,7 @@ def delete_pump(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][EPA3][IN][OUT] # id node1 node2 KEYWORD value {KEYWORD value ...} ;desc # where KEYWORD = [POWER,HEAD,PATTERN,SPEED] #-------------------------------------------------------------- diff --git a/api/s7_valves.py b/api/s7_valves.py index 8eb4fb3..fcd5b72 100644 --- a/api/s7_valves.py +++ b/api/s7_valves.py @@ -123,7 +123,7 @@ def delete_valve(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][EPA3][IN][OUT] # id node1 node2 diam type setting (lcoeff lcurve) # for GPV, setting is string = head curve id # [NOT SUPPORT] for PCV, add loss curve if present From 406d88a6b88a72c0e723bf191a5cd9b7ed1c5ff4 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 2 Mar 2023 20:01:51 +0800 Subject: [PATCH 09/42] Allow to read EPANET3 curve --- api/s12_curves.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/api/s12_curves.py b/api/s12_curves.py index b0e6e71..87f634c 100644 --- a/api/s12_curves.py +++ b/api/s12_curves.py @@ -122,10 +122,14 @@ def delete_curve(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][IN][OUT] # ;type: desc # id x y #-------------------------------------------------------------- +# [EPA3][IN][OUT] +# id type +# id x y +#-------------------------------------------------------------- def inp_in_curve(section: list[str]) -> ChangeSet: types = {} descs = {} @@ -146,6 +150,12 @@ def inp_in_curve(section: list[str]) -> ChangeSet: continue tokens = section[i].split() + + # for EPA3 + if tokens[1] == 'PUMP' or tokens[1] == 'EFFICIENCY' or tokens[1] == 'VOLUME' or tokens[1] == 'HEADLOSS': + types[tokens[0]] = tokens[1] + continue + if tokens[0] not in curves: curves[tokens[0]] = [] curves[tokens[0]].append({'x': float(tokens[1]), 'y': float(tokens[2])}) From a6627c0e34bfd09651897232b94684f45dcb3015 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 2 Mar 2023 20:19:59 +0800 Subject: [PATCH 10/42] Allow to read EPANET3 pattern --- api/s11_patterns.py | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/api/s11_patterns.py b/api/s11_patterns.py index 8099abf..615736a 100644 --- a/api/s11_patterns.py +++ b/api/s11_patterns.py @@ -94,14 +94,22 @@ def delete_pattern(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][IN][OUT] # ;desc # id mult1 mult2 ..... #-------------------------------------------------------------- +# [EPA3][IN][OUT] +# id FIXED (interval) +# id factor1 factor2 ... +# id VARIABLE +# id time1 factor1 time2 factor2 ... +#-------------------------------------------------------------- def inp_in_pattern(section: list[str]) -> ChangeSet: descs = {} patterns: dict[str, list[float]] = {} + variable_patterns: list[str] = [] + count = len(section) for i in range(0, count): if section[i].startswith(';'): @@ -113,10 +121,22 @@ def inp_in_pattern(section: list[str]) -> ChangeSet: continue tokens = section[i].split() + + # for EPA3, ignore time of variable pattern... + if tokens[1] == 'VARIABLE': + variable_patterns.append(tokens[0]) + continue + elif tokens[1] == 'FIXED': + continue + if tokens[0] not in patterns: patterns[tokens[0]] = [] - for token in tokens[1:]: - patterns[tokens[0]].append(float(token)) + if tokens[0] not in variable_patterns: + for token in tokens[1:]: + patterns[tokens[0]].append(float(token)) + else: + for token in tokens[1::2]: + patterns[tokens[0]].append(float(token)) cs = ChangeSet() for id, factors in patterns.items(): From 0ecc706000a21ba0497b482839dfef6c5878641c Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 2 Mar 2023 20:28:47 +0800 Subject: [PATCH 11/42] Add EPANET3 format --- api/s13_controls.py | 3 ++- api/s14_rules.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/api/s13_controls.py b/api/s13_controls.py index f95377e..95832a3 100644 --- a/api/s13_controls.py +++ b/api/s13_controls.py @@ -35,11 +35,12 @@ def set_control(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2] +# [EPA2][EPA3] # LINK linkID setting IF NODE nodeID {BELOW/ABOVE} level # LINK linkID setting AT TIME value (units) # LINK linkID setting AT CLOCKTIME value (units) # (0) (1) (2) (3) (4) (5) (6) (7) +# todo... #-------------------------------------------------------------- def inp_in_control(section: list[str]) -> ChangeSet: if len(section) > 0: diff --git a/api/s14_rules.py b/api/s14_rules.py index 3f7d3d4..714c78c 100644 --- a/api/s14_rules.py +++ b/api/s14_rules.py @@ -35,7 +35,7 @@ def set_rule(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2] +# [EPA2][EPA3] # TODO... #-------------------------------------------------------------- def inp_in_rule(section: list[str]) -> ChangeSet: From 1a050eb9c0c38df405cfe05a88c2620877b063eb Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 2 Mar 2023 20:31:12 +0800 Subject: [PATCH 12/42] Add EPANET3 format --- api/s25_vertices.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/s25_vertices.py b/api/s25_vertices.py index 0228927..932de52 100644 --- a/api/s25_vertices.py +++ b/api/s25_vertices.py @@ -76,8 +76,9 @@ def delete_vertex(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2][IN][OUT] +# [EPA2][IN][OUT] # id x y +# [EPA3][NOT SUPPORT] #-------------------------------------------------------------- def inp_in_vertex(section: list[str]) -> ChangeSet: vertices: dict[str, list[dict[str, float]]] = {} From 0344e262b4c6ea2860543767462b70c8f6b8c49d Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 2 Mar 2023 20:34:04 +0800 Subject: [PATCH 13/42] Fix typo --- api/s22_report.py | 2 +- script/sql/create/22.report.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/s22_report.py b/api/s22_report.py index e093f2f..a0e9515 100644 --- a/api/s22_report.py +++ b/api/s22_report.py @@ -2,7 +2,7 @@ from .database import * #-------------------------------------------------------------- -# [EPANET2] +# [EPA2] # PAGE linesperpage # STATUS {NONE/YES/FULL} # SUMMARY {YES/NO} diff --git a/script/sql/create/22.report.sql b/script/sql/create/22.report.sql index 40f1298..24b6fa4 100644 --- a/script/sql/create/22.report.sql +++ b/script/sql/create/22.report.sql @@ -12,7 +12,7 @@ insert into report (key, value) values , ('STATUS', 'FULL') , ('SUMMARY', 'YES') , ('MESSAGES', 'YES') -, ('ENERY', 'YES') +, ('ENERGY', 'YES') , ('NODES', 'ALL') , ('LINKS', 'ALL') ; From 866019e6cb62d45807fc25ec3a783332345011c7 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 2 Mar 2023 20:39:29 +0800 Subject: [PATCH 14/42] Do not support EPANET3 [REPORT] TRIALS --- api/s22_report.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/s22_report.py b/api/s22_report.py index a0e9515..f396142 100644 --- a/api/s22_report.py +++ b/api/s22_report.py @@ -15,6 +15,8 @@ from .database import * # FILE filename # variable {YES/NO} # variable {BELOW/ABOVE/PRECISION} value +# [EPA3][NOT SUPPORT] +# TRIALS {YES/NO} #-------------------------------------------------------------- def inp_in_report(section: list[str]) -> ChangeSet: return ChangeSet() From b93fcb22e92e1ed200f971a25222ebc2972d385b Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 2 Mar 2023 20:53:27 +0800 Subject: [PATCH 15/42] EPANET3 support EPANET2 [TIMES] keyword --- api/s21_times.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/s21_times.py b/api/s21_times.py index 5a84569..4e74263 100644 --- a/api/s21_times.py +++ b/api/s21_times.py @@ -68,7 +68,7 @@ def set_time(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -# [EPANET2] +# [EPA2][EPA3] # STATISTIC {NONE/AVERAGE/MIN/MAX/RANGE} # DURATION value (units) # HYDRAULIC TIMESTEP value (units) @@ -79,6 +79,7 @@ def set_time(name: str, cs: ChangeSet) -> ChangeSet: # REPORT TIMESTEP value (units) # REPORT START value (units) # START CLOCKTIME value (AM PM) +# [EPA3] supports [EPA2] keyword #-------------------------------------------------------------- def inp_in_time(section: list[str]) -> ChangeSet: if len(section) > 0: From 1e300ae258f1e9da406fae18a556e7a0f2261226 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 2 Mar 2023 22:33:09 +0800 Subject: [PATCH 16/42] Add EPANET3 option table --- script/sql/create/23.options.sql | 39 ++++++++++++++++++++++++++++++++ script/sql/drop/23.options.sql | 2 ++ 2 files changed, 41 insertions(+) diff --git a/script/sql/create/23.options.sql b/script/sql/create/23.options.sql index 732cb40..1c86d66 100644 --- a/script/sql/create/23.options.sql +++ b/script/sql/create/23.options.sql @@ -36,3 +36,42 @@ insert into options (key, value) values , ('MAXCHECK', '10') , ('DAMPLIMIT', '0') ; + + +create table options_3 +( + key text primary key +, value text not null +); + +insert into options_3 (key, value) values + ('FLOW_UNITS', 'GPM') +, ('PRESSURE_UNITS', 'PSI') +, ('HEADLOSS_MODEL', 'H-W') +, ('SPECIFIC_GRAVITY', '1.0') +, ('SPECIFIC_VISCOSITY', '1.0') +, ('MAXIMUM_TRIALS', '100') +, ('HEAD_TOLERANCE', '0.0') +, ('FLOW_TOLERANCE', '0.0') +, ('FLOW_CHANGE_LIMIT', '0.0') +, ('RELATIVE_ACCURACY', '0.0') +, ('TIME_WEIGHT', '0.0') +, ('STEP_SIZING', 'FULL') +, ('IF_UNBALANCED', 'STOP') +, ('DEMAND_MODEL', 'FIXED') +, ('DEMAND_PATTERN', ' ') +, ('DEMAND_MULTIPLIER', '1.0') +, ('MINIMUM_PRESSURE', '0.0') +, ('SERVICE_PRESSURE', '0.0') +, ('PRESSURE_EXPONENT', '0.5') +, ('LEAKAGE_MODEL', 'NONE') +, ('LEAKAGE_COEFF1', '0.0') +, ('LEAKAGE_COEFF2', '0.0') +, ('EMITTER_EXPONENT', '0.5') +, ('QUALITY_MODEL', 'NONE') +, ('QUALITY_NAME', 'Chemical') +, ('QUALITY_UNITS', 'MG/L') +, ('TRACE_NODE', ' ') +, ('SPECIFIC_DIFFUSIVITY', '1.0') +, ('QUALITY_TOLERANCE', '0.01') +; diff --git a/script/sql/drop/23.options.sql b/script/sql/drop/23.options.sql index 50ffe05..32311bb 100644 --- a/script/sql/drop/23.options.sql +++ b/script/sql/drop/23.options.sql @@ -1,3 +1,5 @@ -- [OPTIONS] +drop table if exists options_3; + drop table if exists options; From 3f3b2508b16d8969f50ff06a493a632815380c34 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 2 Mar 2023 22:39:47 +0800 Subject: [PATCH 17/42] Rename options v3 table --- script/sql/create/23.options.sql | 4 ++-- script/sql/drop/23.options.sql | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/script/sql/create/23.options.sql b/script/sql/create/23.options.sql index 1c86d66..24de9e3 100644 --- a/script/sql/create/23.options.sql +++ b/script/sql/create/23.options.sql @@ -38,13 +38,13 @@ insert into options (key, value) values ; -create table options_3 +create table options_v3 ( key text primary key , value text not null ); -insert into options_3 (key, value) values +insert into options_v3 (key, value) values ('FLOW_UNITS', 'GPM') , ('PRESSURE_UNITS', 'PSI') , ('HEADLOSS_MODEL', 'H-W') diff --git a/script/sql/drop/23.options.sql b/script/sql/drop/23.options.sql index 32311bb..91e698f 100644 --- a/script/sql/drop/23.options.sql +++ b/script/sql/drop/23.options.sql @@ -1,5 +1,5 @@ -- [OPTIONS] -drop table if exists options_3; +drop table if exists options_v3; drop table if exists options; From 6951ffa7c7aa4696e025275aac5d80819035359a Mon Sep 17 00:00:00 2001 From: Joey Wang Date: Fri, 3 Mar 2023 13:33:52 +0800 Subject: [PATCH 18/42] Split [PATTERNS] in/out --- api/s11_patterns.py | 51 +++++++++++++++++++++++++++++++++++++-------- 1 file changed, 42 insertions(+), 9 deletions(-) diff --git a/api/s11_patterns.py b/api/s11_patterns.py index 615736a..7ed913f 100644 --- a/api/s11_patterns.py +++ b/api/s11_patterns.py @@ -97,6 +97,45 @@ def delete_pattern(name: str, cs: ChangeSet) -> ChangeSet: # [EPA2][IN][OUT] # ;desc # id mult1 mult2 ..... +#-------------------------------------------------------------- +def inp_in_pattern(section: list[str]) -> ChangeSet: + descs = {} + patterns: dict[str, list[float]] = {} + + count = len(section) + for i in range(0, count): + if section[i].startswith(';'): + # this is description + next = i + 1 + if next < count and section[next].startswith(';') == False: + next_tokens = section[next].split() + descs[next_tokens[0]] = section[i].removeprefix(';') + continue + + tokens = section[i].split() + if tokens[0] not in patterns: + patterns[tokens[0]] = [] + for token in tokens[1:]: + patterns[tokens[0]].append(float(token)) + + cs = ChangeSet() + for id, factors in patterns.items(): + cs.append(g_add_prefix | {'type': 'pattern', 'id' : id, 'factors' : factors}) + + #print(descs) + return cs + + +def inp_out_pattern(name: str) -> list[str]: + lines = [] + objs = read_all(name, f"select * from patterns order by _order") + for obj in objs: + id = obj['id'] + factor = obj['factor'] + lines.append(f'{id} {factor}') + return lines + + #-------------------------------------------------------------- # [EPA3][IN][OUT] # id FIXED (interval) @@ -104,7 +143,7 @@ def delete_pattern(name: str, cs: ChangeSet) -> ChangeSet: # id VARIABLE # id time1 factor1 time2 factor2 ... #-------------------------------------------------------------- -def inp_in_pattern(section: list[str]) -> ChangeSet: +def inp_in_pattern_v3(section: list[str]) -> ChangeSet: descs = {} patterns: dict[str, list[float]] = {} @@ -146,11 +185,5 @@ def inp_in_pattern(section: list[str]) -> ChangeSet: return cs -def inp_out_pattern(name: str) -> list[str]: - lines = [] - objs = read_all(name, f"select * from patterns order by _order") - for obj in objs: - id = obj['id'] - factor = obj['factor'] - lines.append(f'{id} {factor}') - return lines +def inp_out_pattern_v3(name: str) -> list[str]: + return [] From 71976f42fb1280cf3c18e71e9f51013e698b9897 Mon Sep 17 00:00:00 2001 From: Joey Wang Date: Fri, 3 Mar 2023 13:36:17 +0800 Subject: [PATCH 19/42] Split [CURVES] in/out --- api/s12_curves.py | 68 ++++++++++++++++++++++++++++++++++++----------- 1 file changed, 53 insertions(+), 15 deletions(-) diff --git a/api/s12_curves.py b/api/s12_curves.py index 87f634c..e2af652 100644 --- a/api/s12_curves.py +++ b/api/s12_curves.py @@ -125,12 +125,62 @@ def delete_curve(name: str, cs: ChangeSet) -> ChangeSet: # [EPA2][IN][OUT] # ;type: desc # id x y +#-------------------------------------------------------------- +def inp_in_curve(section: list[str]) -> ChangeSet: + types = {} + descs = {} + curves: dict[str, list[dict[str, float]]] = {} + + count = len(section) + for i in range(0, count): + if section[i].startswith(';'): + # this is description + type_plus_desc = section[i].removeprefix(';') + type_plus_desc_tokens = type_plus_desc.split(':') + next = i + 1 + if next < count and section[next].startswith(';') == False: + next_tokens = section[next].split() + types[next_tokens[0]] = type_plus_desc_tokens[0].strip().upper() + if len(type_plus_desc_tokens) > 1: + descs[next_tokens[0]] = type_plus_desc_tokens[1].strip() + continue + + tokens = section[i].split() + if tokens[0] not in curves: + curves[tokens[0]] = [] + curves[tokens[0]].append({'x': float(tokens[1]), 'y': float(tokens[2])}) + + cs = ChangeSet() + for id, coords in curves.items(): + c_type = types[id] if id in types else CURVE_TYPE_PUMP + cs.append(g_add_prefix | {'type': 'curve', 'id' : id, 'c_type': c_type, 'coords' : coords}) + + #print(descs) + return cs + + +def inp_out_curve(name: str) -> list[str]: + lines = [] + types = read_all(name, f"select * from _curve") + for type in types: + id = type['id'] + # ;type: desc + lines.append(f";{type['type']}:") + objs = read_all(name, f"select * from curves where id = '{id}' order by _order") + for obj in objs: + id = obj['id'] + x = obj['x'] + y = obj['y'] + lines.append(f'{id} {x} {y}') + return lines + + #-------------------------------------------------------------- # [EPA3][IN][OUT] # id type # id x y #-------------------------------------------------------------- -def inp_in_curve(section: list[str]) -> ChangeSet: +def inp_in_curve_v3(section: list[str]) -> ChangeSet: types = {} descs = {} curves: dict[str, list[dict[str, float]]] = {} @@ -169,17 +219,5 @@ def inp_in_curve(section: list[str]) -> ChangeSet: return cs -def inp_out_curve(name: str) -> list[str]: - lines = [] - types = read_all(name, f"select * from _curve") - for type in types: - id = type['id'] - # ;type: desc - lines.append(f";{type['type']}:") - objs = read_all(name, f"select * from curves where id = '{id}' order by _order") - for obj in objs: - id = obj['id'] - x = obj['x'] - y = obj['y'] - lines.append(f'{id} {x} {y}') - return lines +def inp_out_curve_v3(name: str) -> list[str]: + return [] From 6b1c5a82692de36a79bcf11924ac9d4957899f6c Mon Sep 17 00:00:00 2001 From: Joey Wang Date: Fri, 3 Mar 2023 13:36:52 +0800 Subject: [PATCH 20/42] Format option --- api/s23_options.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/api/s23_options.py b/api/s23_options.py index 5f4dd99..50d0b97 100644 --- a/api/s23_options.py +++ b/api/s23_options.py @@ -1,34 +1,36 @@ from .database import * -OPTION_UNITS_CFS = 'CFS' -OPTION_UNITS_GPM = 'GPM' -OPTION_UNITS_MGD = 'MGD' + +OPTION_UNITS_CFS = 'CFS' +OPTION_UNITS_GPM = 'GPM' +OPTION_UNITS_MGD = 'MGD' OPTION_UNITS_IMGD = 'IMGD' -OPTION_UNITS_AFD = 'AFD' -OPTION_UNITS_LPS = 'LPS' -OPTION_UNITS_LPM = 'LPM' -OPTION_UNITS_MLD = 'MLD' -OPTION_UNITS_CMH = 'CMH' -OPTION_UNITS_CMD = 'CMD' +OPTION_UNITS_AFD = 'AFD' +OPTION_UNITS_LPS = 'LPS' +OPTION_UNITS_LPM = 'LPM' +OPTION_UNITS_MLD = 'MLD' +OPTION_UNITS_CMH = 'CMH' +OPTION_UNITS_CMD = 'CMD' OPTION_PRESSURE_PSI = 'PSI' OPTION_PRESSURE_KPA = 'KPA' -OPTION_PRESSURE_M = 'M' +OPTION_PRESSURE_M = 'M' OPTION_HEADLOSS_HW = 'H-W' OPTION_HEADLOSS_DW = 'D-W' OPTION_HEADLOSS_CM = 'C-M' -OPTION_UNBALANCED_STOP = 'STOP' +OPTION_UNBALANCED_STOP = 'STOP' OPTION_UNBALANCED_CONTINUE = 'CONTINUE' OPTION_DEMAND_MODEL_DDA = 'DDA' OPTION_DEMAND_MODEL_PDA = 'PDA' -OPTION_QUALITY_NONE = 'NONE' +OPTION_QUALITY_NONE = 'NONE' OPTION_QUALITY_CHEMICAL = 'CHEMICAL' -OPTION_QUALITY_AGE = 'AGE' -OPTION_QUALITY_TRACE = 'TRACE' +OPTION_QUALITY_AGE = 'AGE' +OPTION_QUALITY_TRACE = 'TRACE' + element_schema = {'type': 'str' , 'optional': True , 'readonly': False} From 7d47dcd1b6f0231e4aad4b72b045c8b09ff68be5 Mon Sep 17 00:00:00 2001 From: Joey Wang Date: Fri, 3 Mar 2023 13:37:59 +0800 Subject: [PATCH 21/42] Prepare EPANET3 option api --- api/s23_options_v3.py | 194 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) create mode 100644 api/s23_options_v3.py diff --git a/api/s23_options_v3.py b/api/s23_options_v3.py new file mode 100644 index 0000000..390ca52 --- /dev/null +++ b/api/s23_options_v3.py @@ -0,0 +1,194 @@ +from .database import * +from .s23_options import OPTION_UNITS_CFS, OPTION_UNITS_GPM, OPTION_UNITS_MGD, OPTION_UNITS_IMGD, OPTION_UNITS_AFD, OPTION_UNITS_LPS, OPTION_UNITS_LPM, OPTION_UNITS_MLD, OPTION_UNITS_CMH, OPTION_UNITS_CMD +from .s23_options import OPTION_PRESSURE_PSI, OPTION_PRESSURE_KPA, OPTION_PRESSURE_M +from .s23_options import OPTION_HEADLOSS_HW, OPTION_HEADLOSS_DW, OPTION_HEADLOSS_CM +from .s23_options import OPTION_UNBALANCED_STOP, OPTION_UNBALANCED_CONTINUE +from .s23_options import OPTION_QUALITY_NONE, OPTION_QUALITY_CHEMICAL, OPTION_QUALITY_AGE, OPTION_QUALITY_TRACE +from .s23_options import element_schema + +OPTION_V3_FLOW_UNITS_CFS = OPTION_UNITS_CFS +OPTION_V3_FLOW_UNITS_GPM = OPTION_UNITS_GPM +OPTION_V3_FLOW_UNITS_MGD = OPTION_UNITS_MGD +OPTION_V3_FLOW_UNITS_IMGD = OPTION_UNITS_IMGD +OPTION_V3_FLOW_UNITS_AFD = OPTION_UNITS_AFD +OPTION_V3_FLOW_UNITS_LPS = OPTION_UNITS_LPS +OPTION_V3_FLOW_UNITS_LPM = OPTION_UNITS_LPM +OPTION_V3_FLOW_UNITS_MLD = OPTION_UNITS_MLD +OPTION_V3_FLOW_UNITS_CMH = OPTION_UNITS_CMH +OPTION_V3_FLOW_UNITS_CMD = OPTION_UNITS_CMD + +OPTION_V3_PRESSURE_UNITS_PSI = OPTION_PRESSURE_PSI +OPTION_V3_PRESSURE_UNITS_KPA = OPTION_PRESSURE_KPA +OPTION_V3_PRESSURE_UNITS_M = OPTION_PRESSURE_M + +OPTION_V3_HEADLOSS_MODEL_HW = OPTION_HEADLOSS_HW +OPTION_V3_HEADLOSS_MODEL_DW = OPTION_HEADLOSS_DW +OPTION_V3_HEADLOSS_MODEL_CM = OPTION_HEADLOSS_CM + +OPTION_V3_STEP_SIZING = 'FULL' +OPTION_V3_STEP_SIZING = 'RELAXATION' +OPTION_V3_STEP_SIZING = 'LINESEARCH' + +OPTION_V3_IF_UNBALANCED_STOP = OPTION_UNBALANCED_STOP +OPTION_V3_IF_UNBALANCED_CONTINUE = OPTION_UNBALANCED_CONTINUE + +OPTION_V3_DEMAND_MODEL_FIXED = 'FIXED' +OPTION_V3_DEMAND_MODEL_CONSTRAINED = 'CONSTRAINED' +OPTION_V3_DEMAND_MODEL_POWER = 'POWER' +OPTION_V3_DEMAND_MODEL_LOGISTIC = 'LOGISTIC' + +OPTION_V3_LEAKAGE_MODEL_NONE = 'NONE' +OPTION_V3_LEAKAGE_MODEL_POWER = 'POWER' +OPTION_V3_LEAKAGE_MODEL_FAVAD = 'FAVAD' + +OPTION_V3_QUALITY_MODEL_NONE = OPTION_QUALITY_NONE +OPTION_V3_QUALITY_MODEL_CHEMICAL = OPTION_QUALITY_CHEMICAL +OPTION_V3_QUALITY_MODEL_AGE = OPTION_QUALITY_AGE +OPTION_V3_QUALITY_MODEL_TRACE = OPTION_QUALITY_TRACE + +OPTION_V3_QUALITY_UNITS_HRS = 'HRS' +OPTION_V3_QUALITY_UNITS_PCNT = 'PCNT' +OPTION_V3_QUALITY_UNITS_MGL = 'MG/L' +OPTION_V3_QUALITY_UNITS_UGL = 'UG/L' + + +def get_option_v3_schema(name: str) -> dict[str, dict[str, Any]]: + return { 'UNITS' : element_schema, + 'PRESSURE' : element_schema, + 'HEADLOSS' : element_schema, + 'QUALITY' : element_schema, + 'UNBALANCED' : element_schema, + 'PATTERN' : element_schema, + 'DEMAND MODEL' : element_schema, + 'DEMAND MULTIPLIER' : element_schema, + 'EMITTER EXPONENT' : element_schema, + 'VISCOSITY' : element_schema, + 'DIFFUSIVITY' : element_schema, + 'SPECIFIC GRAVITY' : element_schema, + 'TRIALS' : element_schema, + 'ACCURACY' : element_schema, + 'HEADERROR' : element_schema, + 'FLOWCHANGE' : element_schema, + 'MINIMUM PRESSURE' : element_schema, + 'REQUIRED PRESSURE' : element_schema, + 'PRESSURE EXPONENT' : element_schema, + 'TOLERANCE' : element_schema, + 'HTOL' : element_schema, + 'QTOL' : element_schema, + 'RQTOL' : element_schema, + 'CHECKFREQ' : element_schema, + 'MAXCHECK' : element_schema, + 'DAMPLIMIT' : element_schema } + + +def get_option_v3(name: str) -> dict[str, Any]: + ts = read_all(name, f"select * from options") + d = {} + for e in ts: + d[e['key']] = str(e['value']) + return d + + +def set_option_v3_cmd(name: str, cs: ChangeSet) -> DbChangeSet: + raw_old = get_option_v3(name) + + old = {} + new = {} + + new_dict = cs.operations[0] + schema = get_option_v3_schema(name) + for key in schema.keys(): + if key in new_dict: + old[key] = str(raw_old[key]) + new[key] = str(new_dict[key]) + + redo_cs = g_update_prefix | { 'type' : 'option' } + + redo_sql = '' + for key, value in new.items(): + if redo_sql != '': + redo_sql += '\n' + redo_sql += f"update options set value = '{value}' where key = '{key}';" + redo_cs |= { key: value } + + undo_cs = g_update_prefix | { 'type' : 'option' } + + undo_sql = '' + for key, value in old.items(): + if undo_sql != '': + undo_sql += '\n' + undo_sql += f"update options set value = '{value}' where key = '{key}';" + undo_cs |= { key: value } + + return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) + + +def set_option_v3(name: str, cs: ChangeSet) -> ChangeSet: + return execute_command(name, set_option_v3_cmd(name, cs)) + + +#-------------------------------------------------------------- +# [EPANET2][IN][OUT] +# UNITS CFS/GPM/MGD/IMGD/AFD/LPS/LPM/MLD/CMH/CMD/SI +# PRESSURE PSI/KPA/M +# HEADLOSS H-W/D-W/C-M +# QUALITY NONE/AGE/TRACE/CHEMICAL (TraceNode) +# UNBALANCED STOP/CONTINUE {Niter} +# PATTERN id +# DEMAND MODEL DDA/PDA +# DEMAND MULTIPLIER value +# EMITTER EXPONENT value +# VISCOSITY value +# DIFFUSIVITY value +# SPECIFIC GRAVITY value +# TRIALS value +# ACCURACY value# +# HEADERROR value +# FLOWCHANGE value +# MINIMUM PRESSURE value +# REQUIRED PRESSURE value +# PRESSURE EXPONENT value# +# TOLERANCE value +# HTOL value +# QTOL value +# RQTOL value +# CHECKFREQ value +# MAXCHECK value +# DAMPLIMIT value +# ---- Unsupported Options ----- +# HYDRAULICS USE/SAVE filename +# MAP filename +#-------------------------------------------------------------- +def inp_in_option_v3(section: list[str]) -> ChangeSet: + if len(section) > 0: + cs = g_update_prefix | { 'type' : 'option' } + for s in section: + if s.startswith(';'): + continue + + tokens = s.strip().split() + if tokens[0].upper() == 'PATTERN': # can not upper id + cs |= { 'PATTERN' : tokens[1] } + elif tokens[0].upper() == 'QUALITY': # can not upper trace node + value = tokens[1] + if len(tokens) > 2: + value += f' {tokens[2]}' + cs |= { 'QUALITY' : value } + else: + line = s.upper().strip() + for key in get_option_v3_schema('').keys(): + if line.startswith(key): + value = line.removeprefix(key).strip() + cs |= { key : value } + return ChangeSet(cs) + return ChangeSet() + + +def inp_out_option_v3(name: str) -> list[str]: + lines = [] + objs = read_all(name, f"select * from options") + for obj in objs: + key = obj['key'] + value = obj['value'] + lines.append(f'{key} {value}') + return lines From e9fa51cd4e2abe7e4785c40e8704bfb9e6efd6b9 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 3 Mar 2023 19:01:50 +0800 Subject: [PATCH 22/42] Support EPANET3 [CURVES] out --- api/s12_curves.py | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/api/s12_curves.py b/api/s12_curves.py index e2af652..89235cd 100644 --- a/api/s12_curves.py +++ b/api/s12_curves.py @@ -134,7 +134,7 @@ def inp_in_curve(section: list[str]) -> ChangeSet: count = len(section) for i in range(0, count): if section[i].startswith(';'): - # this is description + # ;type: desc type_plus_desc = section[i].removeprefix(';') type_plus_desc_tokens = type_plus_desc.split(':') next = i + 1 @@ -182,21 +182,11 @@ def inp_out_curve(name: str) -> list[str]: #-------------------------------------------------------------- def inp_in_curve_v3(section: list[str]) -> ChangeSet: types = {} - descs = {} curves: dict[str, list[dict[str, float]]] = {} count = len(section) for i in range(0, count): if section[i].startswith(';'): - # this is description - type_plus_desc = section[i].removeprefix(';') - type_plus_desc_tokens = type_plus_desc.split(':') - next = i + 1 - if next < count and section[next].startswith(';') == False: - next_tokens = section[next].split() - types[next_tokens[0]] = type_plus_desc_tokens[0].strip().upper() - if len(type_plus_desc_tokens) > 1: - descs[next_tokens[0]] = type_plus_desc_tokens[1].strip() continue tokens = section[i].split() @@ -220,4 +210,16 @@ def inp_in_curve_v3(section: list[str]) -> ChangeSet: def inp_out_curve_v3(name: str) -> list[str]: - return [] + lines = [] + types = read_all(name, f"select * from _curve") + for type in types: + id = type['id'] + # id type + lines.append(f"{id} {type['type']}") + objs = read_all(name, f"select * from curves where id = '{id}' order by _order") + for obj in objs: + id = obj['id'] + x = obj['x'] + y = obj['y'] + lines.append(f'{id} {x} {y}') + return lines From ece98ae07c8c1156ab2ddf96780b405cd6e7ed75 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 3 Mar 2023 19:06:56 +0800 Subject: [PATCH 23/42] Support EPANET3 [PATTERNS] out --- api/s11_patterns.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/api/s11_patterns.py b/api/s11_patterns.py index 7ed913f..f354537 100644 --- a/api/s11_patterns.py +++ b/api/s11_patterns.py @@ -144,7 +144,6 @@ def inp_out_pattern(name: str) -> list[str]: # id time1 factor1 time2 factor2 ... #-------------------------------------------------------------- def inp_in_pattern_v3(section: list[str]) -> ChangeSet: - descs = {} patterns: dict[str, list[float]] = {} variable_patterns: list[str] = [] @@ -152,11 +151,6 @@ def inp_in_pattern_v3(section: list[str]) -> ChangeSet: count = len(section) for i in range(0, count): if section[i].startswith(';'): - # this is description - next = i + 1 - if next < count and section[next].startswith(';') == False: - next_tokens = section[next].split() - descs[next_tokens[0]] = section[i].removeprefix(';') continue tokens = section[i].split() @@ -186,4 +180,15 @@ def inp_in_pattern_v3(section: list[str]) -> ChangeSet: def inp_out_pattern_v3(name: str) -> list[str]: - return [] + lines = [] + objs = read_all(name, f"select * from patterns order by _order") + ids = [] + for obj in objs: + id = obj['id'] + if id not in ids: + # for EPA3, ignore time of variable pattern... + lines.append(f'{id} FIXED') + ids.append(id) + factor = obj['factor'] + lines.append(f'{id} {factor}') + return lines From 9ad47d27ccbdeaf940e39af4a3eb559805457192 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 3 Mar 2023 19:50:49 +0800 Subject: [PATCH 24/42] Refine option v2 --- api/s23_options.py | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/api/s23_options.py b/api/s23_options.py index 50d0b97..43e6ada 100644 --- a/api/s23_options.py +++ b/api/s23_options.py @@ -143,28 +143,29 @@ def set_option(name: str, cs: ChangeSet) -> ChangeSet: # MAP filename #-------------------------------------------------------------- def inp_in_option(section: list[str]) -> ChangeSet: - if len(section) > 0: - cs = g_update_prefix | { 'type' : 'option' } - for s in section: - if s.startswith(';'): - continue + if len(section) <= 0: + return ChangeSet() - tokens = s.strip().split() - if tokens[0].upper() == 'PATTERN': # can not upper id - cs |= { 'PATTERN' : tokens[1] } - elif tokens[0].upper() == 'QUALITY': # can not upper trace node - value = tokens[1] - if len(tokens) > 2: - value += f' {tokens[2]}' - cs |= { 'QUALITY' : value } - else: - line = s.upper().strip() - for key in get_option_schema('').keys(): - if line.startswith(key): - value = line.removeprefix(key).strip() - cs |= { key : value } - return ChangeSet(cs) - return ChangeSet() + cs = g_update_prefix | { 'type' : 'option' } + for s in section: + if s.startswith(';'): + continue + + tokens = s.strip().split() + if tokens[0].upper() == 'PATTERN': # can not upper id + cs |= { 'PATTERN' : tokens[1] } + elif tokens[0].upper() == 'QUALITY': # can not upper trace node + value = tokens[1] + if len(tokens) > 2: + value += f' {tokens[2]}' + cs |= { 'QUALITY' : value } + else: + line = s.upper().strip() + for key in get_option_schema('').keys(): + if line.startswith(key): + value = line.removeprefix(key).strip() + cs |= { key : value } + return ChangeSet(cs) def inp_out_option(name: str) -> list[str]: From c813c3d6fbf1aa993940884844b7eb3cdf0971c9 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 3 Mar 2023 19:51:21 +0800 Subject: [PATCH 25/42] Implement option v3 in --- api/s23_options_v3.py | 148 ++++++++++++++++++------------------------ 1 file changed, 62 insertions(+), 86 deletions(-) diff --git a/api/s23_options_v3.py b/api/s23_options_v3.py index 390ca52..e1e9c50 100644 --- a/api/s23_options_v3.py +++ b/api/s23_options_v3.py @@ -53,36 +53,39 @@ OPTION_V3_QUALITY_UNITS_UGL = 'UG/L' def get_option_v3_schema(name: str) -> dict[str, dict[str, Any]]: - return { 'UNITS' : element_schema, - 'PRESSURE' : element_schema, - 'HEADLOSS' : element_schema, - 'QUALITY' : element_schema, - 'UNBALANCED' : element_schema, - 'PATTERN' : element_schema, - 'DEMAND MODEL' : element_schema, - 'DEMAND MULTIPLIER' : element_schema, - 'EMITTER EXPONENT' : element_schema, - 'VISCOSITY' : element_schema, - 'DIFFUSIVITY' : element_schema, - 'SPECIFIC GRAVITY' : element_schema, - 'TRIALS' : element_schema, - 'ACCURACY' : element_schema, - 'HEADERROR' : element_schema, - 'FLOWCHANGE' : element_schema, - 'MINIMUM PRESSURE' : element_schema, - 'REQUIRED PRESSURE' : element_schema, - 'PRESSURE EXPONENT' : element_schema, - 'TOLERANCE' : element_schema, - 'HTOL' : element_schema, - 'QTOL' : element_schema, - 'RQTOL' : element_schema, - 'CHECKFREQ' : element_schema, - 'MAXCHECK' : element_schema, - 'DAMPLIMIT' : element_schema } + return { 'FLOW_UNITS' : element_schema, + 'PRESSURE_UNITS' : element_schema, + 'HEADLOSS_MODEL' : element_schema, + 'SPECIFIC_GRAVITY' : element_schema, + 'SPECIFIC_VISCOSITY' : element_schema, + 'MAXIMUM_TRIALS' : element_schema, + 'HEAD_TOLERANCE' : element_schema, + 'FLOW_TOLERANCE' : element_schema, + 'FLOW_CHANGE_LIMIT' : element_schema, + 'RELATIVE_ACCURACY' : element_schema, + 'TIME_WEIGHT' : element_schema, + 'STEP_SIZING' : element_schema, + 'IF_UNBALANCED' : element_schema, + 'DEMAND_MODEL' : element_schema, + 'DEMAND_PATTERN' : element_schema, + 'DEMAND_MULTIPLIER' : element_schema, + 'MINIMUM_PRESSURE' : element_schema, + 'SERVICE_PRESSURE' : element_schema, + 'PRESSURE_EXPONENT' : element_schema, + 'LEAKAGE_MODEL' : element_schema, + 'LEAKAGE_COEFF1' : element_schema, + 'LEAKAGE_COEFF2' : element_schema, + 'EMITTER_EXPONENT' : element_schema, + 'QUALITY_MODEL' : element_schema, + 'QUALITY_NAME' : element_schema, + 'QUALITY_UNITS' : element_schema, + 'TRACE_NODE' : element_schema, + 'SPECIFIC_DIFFUSIVITY' : element_schema, + 'QUALITY_TOLERANCE' : element_schema } def get_option_v3(name: str) -> dict[str, Any]: - ts = read_all(name, f"select * from options") + ts = read_all(name, f"select * from options_v3") d = {} for e in ts: d[e['key']] = str(e['value']) @@ -102,22 +105,22 @@ def set_option_v3_cmd(name: str, cs: ChangeSet) -> DbChangeSet: old[key] = str(raw_old[key]) new[key] = str(new_dict[key]) - redo_cs = g_update_prefix | { 'type' : 'option' } + redo_cs = g_update_prefix | { 'type' : 'option_v3' } redo_sql = '' for key, value in new.items(): if redo_sql != '': redo_sql += '\n' - redo_sql += f"update options set value = '{value}' where key = '{key}';" + redo_sql += f"update options_v3 set value = '{value}' where key = '{key}';" redo_cs |= { key: value } - undo_cs = g_update_prefix | { 'type' : 'option' } + undo_cs = g_update_prefix | { 'type' : 'option_v3' } undo_sql = '' for key, value in old.items(): if undo_sql != '': undo_sql += '\n' - undo_sql += f"update options set value = '{value}' where key = '{key}';" + undo_sql += f"update options_v3 set value = '{value}' where key = '{key}';" undo_cs |= { key: value } return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) @@ -127,66 +130,39 @@ def set_option_v3(name: str, cs: ChangeSet) -> ChangeSet: return execute_command(name, set_option_v3_cmd(name, cs)) -#-------------------------------------------------------------- -# [EPANET2][IN][OUT] -# UNITS CFS/GPM/MGD/IMGD/AFD/LPS/LPM/MLD/CMH/CMD/SI -# PRESSURE PSI/KPA/M -# HEADLOSS H-W/D-W/C-M -# QUALITY NONE/AGE/TRACE/CHEMICAL (TraceNode) -# UNBALANCED STOP/CONTINUE {Niter} -# PATTERN id -# DEMAND MODEL DDA/PDA -# DEMAND MULTIPLIER value -# EMITTER EXPONENT value -# VISCOSITY value -# DIFFUSIVITY value -# SPECIFIC GRAVITY value -# TRIALS value -# ACCURACY value# -# HEADERROR value -# FLOWCHANGE value -# MINIMUM PRESSURE value -# REQUIRED PRESSURE value -# PRESSURE EXPONENT value# -# TOLERANCE value -# HTOL value -# QTOL value -# RQTOL value -# CHECKFREQ value -# MAXCHECK value -# DAMPLIMIT value -# ---- Unsupported Options ----- -# HYDRAULICS USE/SAVE filename -# MAP filename -#-------------------------------------------------------------- -def inp_in_option_v3(section: list[str]) -> ChangeSet: - if len(section) > 0: - cs = g_update_prefix | { 'type' : 'option' } - for s in section: - if s.startswith(';'): - continue - - tokens = s.strip().split() - if tokens[0].upper() == 'PATTERN': # can not upper id - cs |= { 'PATTERN' : tokens[1] } - elif tokens[0].upper() == 'QUALITY': # can not upper trace node - value = tokens[1] - if len(tokens) > 2: - value += f' {tokens[2]}' - cs |= { 'QUALITY' : value } - else: - line = s.upper().strip() - for key in get_option_v3_schema('').keys(): - if line.startswith(key): - value = line.removeprefix(key).strip() - cs |= { key : value } - return ChangeSet(cs) +def _sync_to_v2() -> ChangeSet: return ChangeSet() +def inp_in_option_v3(section: list[str]) -> ChangeSet: + if len(section) <= 0: + return ChangeSet() + + cs = g_update_prefix | { 'type' : 'option_v3' } + v2_lines = [] + for s in section: + if s.startswith(';'): + continue + + tokens = s.strip().split() + key = tokens[0] + if key in get_option_v3_schema('').keys(): + value = tokens[1] if len(tokens) >= 2 else '' + cs |= { key : value } + else: + v2_lines.append(s.strip()) + + for line in v2_lines: + pass + + result = ChangeSet(cs) + result.merge(_sync_to_v2()) + return result + + def inp_out_option_v3(name: str) -> list[str]: lines = [] - objs = read_all(name, f"select * from options") + objs = read_all(name, f"select * from options_v3") for obj in objs: key = obj['key'] value = obj['value'] From 5ad42429e5893755720f1b39352d36fb7deb4357 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 3 Mar 2023 20:15:49 +0800 Subject: [PATCH 26/42] Add EPANET3 option api --- api/__init__.py | 11 +++++++++ tjnetwork.py | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) diff --git a/api/__init__.py b/api/__init__.py index 8be1cdf..4e6f570 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -97,6 +97,17 @@ from .s23_options import OPTION_DEMAND_MODEL_DDA, OPTION_DEMAND_MODEL_PDA from .s23_options import OPTION_QUALITY_NONE, OPTION_QUALITY_CHEMICAL, OPTION_QUALITY_AGE, OPTION_QUALITY_TRACE from .s23_options import get_option_schema, get_option, set_option +from .s23_options_v3 import OPTION_V3_FLOW_UNITS_CFS, OPTION_V3_FLOW_UNITS_GPM, OPTION_V3_FLOW_UNITS_MGD, OPTION_V3_FLOW_UNITS_IMGD, OPTION_V3_FLOW_UNITS_AFD, OPTION_V3_FLOW_UNITS_LPS, OPTION_V3_FLOW_UNITS_LPM, OPTION_V3_FLOW_UNITS_MLD, OPTION_V3_FLOW_UNITS_CMH, OPTION_V3_FLOW_UNITS_CMD +from .s23_options_v3 import OPTION_V3_PRESSURE_UNITS_PSI, OPTION_V3_PRESSURE_UNITS_KPA, OPTION_V3_PRESSURE_UNITS_M +from .s23_options_v3 import OPTION_V3_HEADLOSS_MODEL_HW, OPTION_V3_HEADLOSS_MODEL_DW, OPTION_V3_HEADLOSS_MODEL_CM +from .s23_options_v3 import OPTION_V3_STEP_SIZING, OPTION_V3_STEP_SIZING, OPTION_V3_STEP_SIZING +from .s23_options_v3 import OPTION_V3_IF_UNBALANCED_STOP, OPTION_V3_IF_UNBALANCED_CONTINUE +from .s23_options_v3 import OPTION_V3_DEMAND_MODEL_FIXED, OPTION_V3_DEMAND_MODEL_CONSTRAINED, OPTION_V3_DEMAND_MODEL_POWER, OPTION_V3_DEMAND_MODEL_LOGISTIC +from .s23_options_v3 import OPTION_V3_LEAKAGE_MODEL_NONE, OPTION_V3_LEAKAGE_MODEL_POWER, OPTION_V3_LEAKAGE_MODEL_FAVAD +from .s23_options_v3 import OPTION_V3_QUALITY_MODEL_NONE, OPTION_V3_QUALITY_MODEL_CHEMICAL, OPTION_V3_QUALITY_MODEL_AGE, OPTION_V3_QUALITY_MODEL_TRACE +from .s23_options_v3 import OPTION_V3_QUALITY_UNITS_HRS, OPTION_V3_QUALITY_UNITS_PCNT, OPTION_V3_QUALITY_UNITS_MGL, OPTION_V3_QUALITY_UNITS_UGL +from .s23_options_v3 import get_option_v3_schema, get_option_v3, set_option_v3 + from .s24_coordinates import get_node_coord from .s25_vertices import get_vertex_schema, get_vertex, set_vertex, add_vertex, delete_vertex diff --git a/tjnetwork.py b/tjnetwork.py index cac960e..27734cd 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -99,6 +99,51 @@ OPTION_QUALITY_CHEMICAL = api.OPTION_QUALITY_CHEMICAL OPTION_QUALITY_AGE = api.OPTION_QUALITY_AGE OPTION_QUALITY_TRACE = api.OPTION_QUALITY_TRACE +OPTION_V3_FLOW_UNITS_CFS = api.OPTION_V3_FLOW_UNITS_CFS +OPTION_V3_FLOW_UNITS_GPM = api.OPTION_V3_FLOW_UNITS_GPM +OPTION_V3_FLOW_UNITS_MGD = api.OPTION_V3_FLOW_UNITS_MGD +OPTION_V3_FLOW_UNITS_IMGD = api.OPTION_V3_FLOW_UNITS_IMGD +OPTION_V3_FLOW_UNITS_AFD = api.OPTION_V3_FLOW_UNITS_AFD +OPTION_V3_FLOW_UNITS_LPS = api.OPTION_V3_FLOW_UNITS_LPS +OPTION_V3_FLOW_UNITS_LPM = api.OPTION_V3_FLOW_UNITS_LPM +OPTION_V3_FLOW_UNITS_MLD = api.OPTION_V3_FLOW_UNITS_MLD +OPTION_V3_FLOW_UNITS_CMH = api.OPTION_V3_FLOW_UNITS_CMH +OPTION_V3_FLOW_UNITS_CMD = api.OPTION_V3_FLOW_UNITS_CMD + +OPTION_V3_PRESSURE_UNITS_PSI = api.OPTION_V3_PRESSURE_UNITS_PSI +OPTION_V3_PRESSURE_UNITS_KPA = api.OPTION_V3_PRESSURE_UNITS_KPA +OPTION_V3_PRESSURE_UNITS_M = api.OPTION_V3_PRESSURE_UNITS_M + +OPTION_V3_HEADLOSS_MODEL_HW = api.OPTION_V3_HEADLOSS_MODEL_HW +OPTION_V3_HEADLOSS_MODEL_DW = api.OPTION_V3_HEADLOSS_MODEL_DW +OPTION_V3_HEADLOSS_MODEL_CM = api.OPTION_V3_HEADLOSS_MODEL_CM + +OPTION_V3_STEP_SIZING = api.OPTION_V3_STEP_SIZING +OPTION_V3_STEP_SIZING = api.OPTION_V3_STEP_SIZING +OPTION_V3_STEP_SIZING = api.OPTION_V3_STEP_SIZING + +OPTION_V3_IF_UNBALANCED_STOP = api.OPTION_V3_IF_UNBALANCED_STOP +OPTION_V3_IF_UNBALANCED_CONTINUE = api.OPTION_V3_IF_UNBALANCED_CONTINUE + +OPTION_V3_DEMAND_MODEL_FIXED = api.OPTION_V3_DEMAND_MODEL_FIXED +OPTION_V3_DEMAND_MODEL_CONSTRAINED = api.OPTION_V3_DEMAND_MODEL_CONSTRAINED +OPTION_V3_DEMAND_MODEL_POWER = api.OPTION_V3_DEMAND_MODEL_POWER +OPTION_V3_DEMAND_MODEL_LOGISTIC = api.OPTION_V3_DEMAND_MODEL_LOGISTIC + +OPTION_V3_LEAKAGE_MODEL_NONE = api.OPTION_V3_LEAKAGE_MODEL_NONE +OPTION_V3_LEAKAGE_MODEL_POWER = api.OPTION_V3_LEAKAGE_MODEL_POWER +OPTION_V3_LEAKAGE_MODEL_FAVAD = api.OPTION_V3_LEAKAGE_MODEL_FAVAD + +OPTION_V3_QUALITY_MODEL_NONE = api.OPTION_V3_QUALITY_MODEL_NONE +OPTION_V3_QUALITY_MODEL_CHEMICAL = api.OPTION_V3_QUALITY_MODEL_CHEMICAL +OPTION_V3_QUALITY_MODEL_AGE = api.OPTION_V3_QUALITY_MODEL_AGE +OPTION_V3_QUALITY_MODEL_TRACE = api.OPTION_V3_QUALITY_MODEL_TRACE + +OPTION_V3_QUALITY_UNITS_HRS = api.OPTION_V3_QUALITY_UNITS_HRS +OPTION_V3_QUALITY_UNITS_PCNT = api.OPTION_V3_QUALITY_UNITS_PCNT +OPTION_V3_QUALITY_UNITS_MGL = api.OPTION_V3_QUALITY_UNITS_MGL +OPTION_V3_QUALITY_UNITS_UGL = api.OPTION_V3_QUALITY_UNITS_UGL + SCADA_DEVICE_TYPE_PRESSURE = api.SCADA_DEVICE_TYPE_PRESSURE SCADA_DEVICE_TYPE_DEMAND = api.SCADA_DEVICE_TYPE_DEMAND SCADA_DEVICE_TYPE_QUALITY = api.SCADA_DEVICE_TYPE_QUALITY @@ -709,6 +754,20 @@ def set_option(name: str, cs: ChangeSet) -> ChangeSet: return api.set_option(name, cs) +############################################################ +# option_v3 23.[EPA3][OPTIONS] +############################################################ + +def get_option_v3_schema(name: str) -> dict[str, dict[str, Any]]: + return api.get_option_v3_schema(name) + +def get_option_v3(name: str) -> dict[str, Any]: + return api.get_option_v3(name) + +def set_option_v3(name: str, cs: ChangeSet) -> ChangeSet: + return api.set_option_v3(name, cs) + + ############################################################ # coord 24.[COORDINATES] ############################################################ From 998e81aed3a546d55a937840d4a7e9e0519b1d72 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 3 Mar 2023 20:16:48 +0800 Subject: [PATCH 27/42] Sync to v3 for v2 --- api/s23_options.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/api/s23_options.py b/api/s23_options.py index 43e6ada..b0580ed 100644 --- a/api/s23_options.py +++ b/api/s23_options.py @@ -142,6 +142,12 @@ def set_option(name: str, cs: ChangeSet) -> ChangeSet: # HYDRAULICS USE/SAVE filename # MAP filename #-------------------------------------------------------------- + + +def _sync_to_v3() -> ChangeSet: + return ChangeSet() + + def inp_in_option(section: list[str]) -> ChangeSet: if len(section) <= 0: return ChangeSet() @@ -165,7 +171,10 @@ def inp_in_option(section: list[str]) -> ChangeSet: if line.startswith(key): value = line.removeprefix(key).strip() cs |= { key : value } - return ChangeSet(cs) + + result = ChangeSet(cs) + result.merge(_sync_to_v3()) + return result def inp_out_option(name: str) -> list[str]: From 04986a136395f14644dd7ad7b46b65cddb8280d3 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Fri, 3 Mar 2023 20:22:47 +0800 Subject: [PATCH 28/42] Format enum --- tjnetwork.py | 86 ++++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/tjnetwork.py b/tjnetwork.py index 27734cd..a831227 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -7,7 +7,7 @@ import epanet # ChangeSet ############################################################ -API_ADD = api.API_ADD +API_ADD = api.API_ADD API_UPDATE = api.API_UPDATE API_DELETE = api.API_DELETE @@ -18,21 +18,21 @@ ChangeSet = api.ChangeSet # enum ############################################################ -JUNCTION = api.JUNCTION +JUNCTION = api.JUNCTION RESERVOIR = api.RESERVOIR -TANK = api.TANK -PIPE = api.PIPE -PUMP = api.PUMP -VALVE = api.VALVE -PATTERN = api.PATTERN -CURVE = api.CURVE +TANK = api.TANK +PIPE = api.PIPE +PUMP = api.PUMP +VALVE = api.VALVE +PATTERN = api.PATTERN +CURVE = api.CURVE OVERFLOW_YES = api.OVERFLOW_YES -OVERFLOW_NO = api.OVERFLOW_NO +OVERFLOW_NO = api.OVERFLOW_NO -PIPE_STATUS_OPEN = api.PIPE_STATUS_OPEN +PIPE_STATUS_OPEN = api.PIPE_STATUS_OPEN PIPE_STATUS_CLOSED = api.PIPE_STATUS_CLOSED -PIPE_STATUS_CV = api.PIPE_STATUS_CV +PIPE_STATUS_CV = api.PIPE_STATUS_CV VALVES_TYPE_PRV = api.VALVES_TYPE_PRV VALVES_TYPE_PSV = api.VALVES_TYPE_PSV @@ -44,60 +44,60 @@ VALVES_TYPE_GPV = api.VALVES_TYPE_GPV TAG_TYPE_NODE = api.TAG_TYPE_NODE TAG_TYPE_LINK = api.TAG_TYPE_LINK -LINK_STATUS_OPEN = api.LINK_STATUS_OPEN +LINK_STATUS_OPEN = api.LINK_STATUS_OPEN LINK_STATUS_CLOSED = api.LINK_STATUS_CLOSED LINK_STATUS_ACTIVE = api.LINK_STATUS_ACTIVE -CURVE_TYPE_PUMP = api.CURVE_TYPE_PUMP +CURVE_TYPE_PUMP = api.CURVE_TYPE_PUMP CURVE_TYPE_EFFICIENCY = api.CURVE_TYPE_EFFICIENCY -CURVE_TYPE_VOLUME = api.CURVE_TYPE_VOLUME -CURVE_TYPE_HEADLOSS = api.CURVE_TYPE_HEADLOSS +CURVE_TYPE_VOLUME = api.CURVE_TYPE_VOLUME +CURVE_TYPE_HEADLOSS = api.CURVE_TYPE_HEADLOSS -SOURCE_TYPE_CONCEN = api.SOURCE_TYPE_CONCEN -SOURCE_TYPE_MASS = api.SOURCE_TYPE_MASS +SOURCE_TYPE_CONCEN = api.SOURCE_TYPE_CONCEN +SOURCE_TYPE_MASS = api.SOURCE_TYPE_MASS SOURCE_TYPE_FLOWPACED = api.SOURCE_TYPE_FLOWPACED -SOURCE_TYPE_SETPOINT = api.SOURCE_TYPE_SETPOINT +SOURCE_TYPE_SETPOINT = api.SOURCE_TYPE_SETPOINT MIXING_MODEL_MIXED = api.MIXING_MODEL_MIXED MIXING_MODEL_2COMP = api.MIXING_MODEL_2COMP -MIXING_MODEL_FIFO = api.MIXING_MODEL_FIFO -MIXING_MODEL_LIFO = api.MIXING_MODEL_LIFO +MIXING_MODEL_FIFO = api.MIXING_MODEL_FIFO +MIXING_MODEL_LIFO = api.MIXING_MODEL_LIFO -TIME_STATISTIC_NONE = api.TIME_STATISTIC_NONE +TIME_STATISTIC_NONE = api.TIME_STATISTIC_NONE TIME_STATISTIC_AVERAGED = api.TIME_STATISTIC_AVERAGED -TIME_STATISTIC_MINIMUM = api.TIME_STATISTIC_MINIMUM -TIME_STATISTIC_MAXIMUM = api.TIME_STATISTIC_MAXIMUM -TIME_STATISTIC_RANGE = api.TIME_STATISTIC_RANGE +TIME_STATISTIC_MINIMUM = api.TIME_STATISTIC_MINIMUM +TIME_STATISTIC_MAXIMUM = api.TIME_STATISTIC_MAXIMUM +TIME_STATISTIC_RANGE = api.TIME_STATISTIC_RANGE -OPTION_UNITS_CFS = api.OPTION_UNITS_CFS -OPTION_UNITS_GPM = api.OPTION_UNITS_GPM -OPTION_UNITS_MGD = api.OPTION_UNITS_MGD +OPTION_UNITS_CFS = api.OPTION_UNITS_CFS +OPTION_UNITS_GPM = api.OPTION_UNITS_GPM +OPTION_UNITS_MGD = api.OPTION_UNITS_MGD OPTION_UNITS_IMGD = api.OPTION_UNITS_IMGD -OPTION_UNITS_AFD = api.OPTION_UNITS_AFD -OPTION_UNITS_LPS = api.OPTION_UNITS_LPS -OPTION_UNITS_LPM = api.OPTION_UNITS_LPM -OPTION_UNITS_MLD = api.OPTION_UNITS_MLD -OPTION_UNITS_CMH = api.OPTION_UNITS_CMH -OPTION_UNITS_CMD = api.OPTION_UNITS_CMD +OPTION_UNITS_AFD = api.OPTION_UNITS_AFD +OPTION_UNITS_LPS = api.OPTION_UNITS_LPS +OPTION_UNITS_LPM = api.OPTION_UNITS_LPM +OPTION_UNITS_MLD = api.OPTION_UNITS_MLD +OPTION_UNITS_CMH = api.OPTION_UNITS_CMH +OPTION_UNITS_CMD = api.OPTION_UNITS_CMD OPTION_PRESSURE_PSI = api.OPTION_PRESSURE_PSI OPTION_PRESSURE_KPA = api.OPTION_PRESSURE_KPA -OPTION_PRESSURE_M = api.OPTION_PRESSURE_M +OPTION_PRESSURE_M = api.OPTION_PRESSURE_M OPTION_HEADLOSS_HW = api.OPTION_HEADLOSS_HW OPTION_HEADLOSS_DW = api.OPTION_HEADLOSS_DW OPTION_HEADLOSS_CM = api.OPTION_HEADLOSS_CM -OPTION_UNBALANCED_STOP = api.OPTION_UNBALANCED_STOP +OPTION_UNBALANCED_STOP = api.OPTION_UNBALANCED_STOP OPTION_UNBALANCED_CONTINUE = api.OPTION_UNBALANCED_CONTINUE OPTION_DEMAND_MODEL_DDA = api.OPTION_DEMAND_MODEL_DDA OPTION_DEMAND_MODEL_PDA = api.OPTION_DEMAND_MODEL_PDA -OPTION_QUALITY_NONE = api.OPTION_QUALITY_NONE +OPTION_QUALITY_NONE = api.OPTION_QUALITY_NONE OPTION_QUALITY_CHEMICAL = api.OPTION_QUALITY_CHEMICAL -OPTION_QUALITY_AGE = api.OPTION_QUALITY_AGE -OPTION_QUALITY_TRACE = api.OPTION_QUALITY_TRACE +OPTION_QUALITY_AGE = api.OPTION_QUALITY_AGE +OPTION_QUALITY_TRACE = api.OPTION_QUALITY_TRACE OPTION_V3_FLOW_UNITS_CFS = api.OPTION_V3_FLOW_UNITS_CFS OPTION_V3_FLOW_UNITS_GPM = api.OPTION_V3_FLOW_UNITS_GPM @@ -145,12 +145,12 @@ OPTION_V3_QUALITY_UNITS_MGL = api.OPTION_V3_QUALITY_UNITS_MGL OPTION_V3_QUALITY_UNITS_UGL = api.OPTION_V3_QUALITY_UNITS_UGL SCADA_DEVICE_TYPE_PRESSURE = api.SCADA_DEVICE_TYPE_PRESSURE -SCADA_DEVICE_TYPE_DEMAND = api.SCADA_DEVICE_TYPE_DEMAND -SCADA_DEVICE_TYPE_QUALITY = api.SCADA_DEVICE_TYPE_QUALITY -SCADA_DEVICE_TYPE_LEVEL = api.SCADA_DEVICE_TYPE_LEVEL -SCADA_DEVICE_TYPE_FLOW = api.SCADA_DEVICE_TYPE_FLOW +SCADA_DEVICE_TYPE_DEMAND = api.SCADA_DEVICE_TYPE_DEMAND +SCADA_DEVICE_TYPE_QUALITY = api.SCADA_DEVICE_TYPE_QUALITY +SCADA_DEVICE_TYPE_LEVEL = api.SCADA_DEVICE_TYPE_LEVEL +SCADA_DEVICE_TYPE_FLOW = api.SCADA_DEVICE_TYPE_FLOW -SCADA_ELEMENT_STATUS_ONLINE = api.SCADA_ELEMENT_STATUS_ONLINE +SCADA_ELEMENT_STATUS_ONLINE = api.SCADA_ELEMENT_STATUS_ONLINE SCADA_ELEMENT_STATUS_OFFLINE = api.SCADA_ELEMENT_STATUS_OFFLINE From ca1a065d54e3662889b5f99cb7a817e84e3f6bfd Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Tue, 7 Mar 2023 21:16:30 +0800 Subject: [PATCH 29/42] Support to convert between option v2 & v3 --- api/s23_options.py | 10 ++-- api/s23_options_util.py | 129 ++++++++++++++++++++++++++++++++++++++++ api/s23_options_v3.py | 38 +++++++++--- 3 files changed, 162 insertions(+), 15 deletions(-) create mode 100644 api/s23_options_util.py diff --git a/api/s23_options.py b/api/s23_options.py index b0580ed..ffcb46d 100644 --- a/api/s23_options.py +++ b/api/s23_options.py @@ -1,4 +1,5 @@ from .database import * +from .s23_options_util import generate_v3 OPTION_UNITS_CFS = 'CFS' @@ -144,10 +145,6 @@ def set_option(name: str, cs: ChangeSet) -> ChangeSet: #-------------------------------------------------------------- -def _sync_to_v3() -> ChangeSet: - return ChangeSet() - - def inp_in_option(section: list[str]) -> ChangeSet: if len(section) <= 0: return ChangeSet() @@ -173,7 +170,7 @@ def inp_in_option(section: list[str]) -> ChangeSet: cs |= { key : value } result = ChangeSet(cs) - result.merge(_sync_to_v3()) + result.merge(generate_v3(result)) return result @@ -183,5 +180,6 @@ def inp_out_option(name: str) -> list[str]: for obj in objs: key = obj['key'] value = obj['value'] - lines.append(f'{key} {value}') + if value != '': + lines.append(f'{key} {value}') return lines diff --git a/api/s23_options_util.py b/api/s23_options_util.py new file mode 100644 index 0000000..2244c25 --- /dev/null +++ b/api/s23_options_util.py @@ -0,0 +1,129 @@ +from .database import * + +_key_map_23 = { + 'UNITS' : 'FLOW_UNITS', + 'PRESSURE' : 'PRESSURE_UNITS', + 'HEADLOSS' : 'HEADLOSS_MODEL', + 'QUALITY' : 'QUALITY_MODEL', + 'UNBALANCED' : 'IF_UNBALANCED', + 'PATTERN' : 'DEMAND_PATTERN', + 'DEMAND MODEL' : 'DEMAND_MODEL', + 'DEMAND MULTIPLIER' : 'DEMAND_MULTIPLIER', + 'EMITTER EXPONENT' : 'EMITTER_EXPONENT', + 'VISCOSITY' : 'SPECIFIC_VISCOSITY', + 'DIFFUSIVITY' : 'SPECIFIC_DIFFUSIVITY', + 'SPECIFIC GRAVITY' : 'SPECIFIC_GRAVITY', + 'TRIALS' : 'MAXIMUM_TRIALS', + 'ACCURACY' : 'RELATIVE_ACCURACY', + #'HEADERROR' : '', + 'FLOWCHANGE' : 'FLOW_CHANGE_LIMIT', + 'MINIMUM PRESSURE' : 'MINIMUM_PRESSURE', + 'REQUIRED PRESSURE' : 'SERVICE_PRESSURE', + 'PRESSURE EXPONENT' : 'PRESSURE_EXPONENT', + 'TOLERANCE' : 'QUALITY_TOLERANCE', + 'HTOL' : 'HEAD_TOLERANCE', + 'QTOL' : 'FLOW_TOLERANCE', + #'RQTOL' : '', + #'CHECKFREQ' : '', + #'MAXCHECK' : '', + #'DAMPLIMIT' : '', +} + + +_key_map_32 = { + 'FLOW_UNITS' : 'UNITS', + 'PRESSURE_UNITS' : 'PRESSURE', + 'HEADLOSS_MODEL' : 'HEADLOSS', + 'SPECIFIC_GRAVITY' : 'SPECIFIC GRAVITY', + 'SPECIFIC_VISCOSITY' : 'VISCOSITY', + 'MAXIMUM_TRIALS' : 'TRIALS', + 'HEAD_TOLERANCE' : 'HTOL', + 'FLOW_TOLERANCE' : 'QTOL', + 'FLOW_CHANGE_LIMIT' : 'FLOWCHANGE', + 'RELATIVE_ACCURACY' : 'ACCURACY', + #'TIME_WEIGHT' : '', + #'STEP_SIZING' : '', + 'IF_UNBALANCED' : 'UNBALANCED', + 'DEMAND_MODEL' : 'DEMAND MODEL', + 'DEMAND_PATTERN' : 'PATTERN', + 'DEMAND_MULTIPLIER' : 'DEMAND MULTIPLIER', + 'MINIMUM_PRESSURE' : 'MINIMUM PRESSURE', + 'SERVICE_PRESSURE' : 'REQUIRED PRESSURE', + 'PRESSURE_EXPONENT' : 'PRESSURE EXPONENT', + #'LEAKAGE_MODEL' : '', + #'LEAKAGE_COEFF1' : '', + #'LEAKAGE_COEFF2' : '', + 'EMITTER_EXPONENT' : 'EMITTER EXPONENT', + 'QUALITY_MODEL' : 'QUALITY', + #'QUALITY_NAME' : '', + #'QUALITY_UNITS' : '', + #'TRACE_NODE' : '', + 'SPECIFIC_DIFFUSIVITY' : 'DIFFUSIVITY', + 'QUALITY_TOLERANCE' : 'TOLERANCE' +} + + +def generate_v2(cs: ChangeSet) -> ChangeSet: + op = cs.operations[0] + + if op['type'] == 'option': + return cs + + map = _key_map_32 + + cs_v2 = {} + for key in op: + if key == 'operation' or key == 'type': + continue + + if key in map.keys(): + if key != 'QUALITY_MODEL' and key != 'DEMAND_MODEL': + cs_v2 |= { map[key] : op[key] } + elif key == 'QUALITY_MODEL': + if str(op[key]).upper() == 'TRACE' and 'TRACE_NODE' in op.keys(): + cs_v2 |= { map[key] : f"TRACE {op['TRACE_NODE']}" } + else: + cs_v2 |= { map[key] : str(op[key]).upper() } + elif key == 'DEMAND_MODEL': + if op[key] == 'FIXED': + cs_v2 |= { map[key] : 'DDA' } + else: + cs_v2 |= { map[key] : 'PDA' } + + if len(cs_v2) > 0: + cs_v2 |= g_update_prefix | { 'type' : 'option' } + return ChangeSet(cs_v2) + + return ChangeSet() + + +def generate_v3(cs: ChangeSet) -> ChangeSet: + op = cs.operations[0] + + if op['type'] == 'option_v3': + return cs + + map = _key_map_23 + + cs_v3 = {} + for key in op: + if key == 'operation' or key == 'type': + continue + + if key in map.keys(): + if key != 'QUALITY' and key != 'DEMAND MODEL': + cs_v3 |= { map[key] : op[key] } + elif key == 'QUALITY': + tokens = str(op[key]).split() + if len(tokens) >= 1: + cs_v3 |= { map[key] : tokens[0].upper() } + if tokens[0].upper() == 'TRACE' and len(tokens) >= 2: + cs_v3 |= { 'TRACE_NODE' : tokens[1] } + elif key == 'DEMAND MODEL': + cs_v3 |= { map[key] : 'POWER' } + + if len(cs_v3) > 0: + cs_v3 |= g_update_prefix | { 'type' : 'option_v3' } + return ChangeSet(cs_v3) + + return ChangeSet() diff --git a/api/s23_options_v3.py b/api/s23_options_v3.py index e1e9c50..fdd233f 100644 --- a/api/s23_options_v3.py +++ b/api/s23_options_v3.py @@ -5,6 +5,8 @@ from .s23_options import OPTION_HEADLOSS_HW, OPTION_HEADLOSS_DW, OPTION_HEADLOSS from .s23_options import OPTION_UNBALANCED_STOP, OPTION_UNBALANCED_CONTINUE from .s23_options import OPTION_QUALITY_NONE, OPTION_QUALITY_CHEMICAL, OPTION_QUALITY_AGE, OPTION_QUALITY_TRACE from .s23_options import element_schema +from .s23_options import get_option_schema +from .s23_options_util import generate_v2, generate_v3 OPTION_V3_FLOW_UNITS_CFS = OPTION_UNITS_CFS OPTION_V3_FLOW_UNITS_GPM = OPTION_UNITS_GPM @@ -130,15 +132,31 @@ def set_option_v3(name: str, cs: ChangeSet) -> ChangeSet: return execute_command(name, set_option_v3_cmd(name, cs)) -def _sync_to_v2() -> ChangeSet: - return ChangeSet() +def _parse_v2(v2_lines: list[str]) -> dict[str, str]: + cs_v2 = g_update_prefix | { 'type' : 'option' } + for s in v2_lines: + tokens = s.split() + if tokens[0].upper() == 'PATTERN': # can not upper id + cs_v2 |= { 'PATTERN' : tokens[1] } + elif tokens[0].upper() == 'QUALITY': # can not upper trace node + value = tokens[1] + if len(tokens) > 2: + value += f' {tokens[2]}' + cs_v2 |= { 'QUALITY' : value } + else: + line = s.upper().strip() + for key in get_option_schema('').keys(): + if line.startswith(key): + value = line.removeprefix(key).strip() + cs_v2 |= { key : value } + return cs_v2 def inp_in_option_v3(section: list[str]) -> ChangeSet: if len(section) <= 0: return ChangeSet() - cs = g_update_prefix | { 'type' : 'option_v3' } + cs_v3 = g_update_prefix | { 'type' : 'option_v3' } v2_lines = [] for s in section: if s.startswith(';'): @@ -148,15 +166,16 @@ def inp_in_option_v3(section: list[str]) -> ChangeSet: key = tokens[0] if key in get_option_v3_schema('').keys(): value = tokens[1] if len(tokens) >= 2 else '' - cs |= { key : value } + cs_v3 |= { key : value } else: v2_lines.append(s.strip()) - for line in v2_lines: - pass + # unlikely... + cs_v2 = _parse_v2(v2_lines) - result = ChangeSet(cs) - result.merge(_sync_to_v2()) + result = ChangeSet(cs_v3) + result.merge(generate_v3(ChangeSet(cs_v2))) + result.merge(generate_v2(result)) return result @@ -166,5 +185,6 @@ def inp_out_option_v3(name: str) -> list[str]: for obj in objs: key = obj['key'] value = obj['value'] - lines.append(f'{key} {value}') + if value != '': + lines.append(f'{key} {value}') return lines From 7c9eb1555a37d8516171697f642aded192d1c9dd Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 8 Mar 2023 22:18:28 +0800 Subject: [PATCH 30/42] Refine set option to sync v2 & v3 --- api/s23_options.py | 10 ++++++++-- api/s23_options_v3.py | 11 ++++++++--- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/api/s23_options.py b/api/s23_options.py index ffcb46d..252d50c 100644 --- a/api/s23_options.py +++ b/api/s23_options.py @@ -1,4 +1,5 @@ from .database import * +from .s23_options_v3 import set_option_v3 from .s23_options_util import generate_v3 @@ -107,8 +108,13 @@ def set_option_cmd(name: str, cs: ChangeSet) -> DbChangeSet: return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) -def set_option(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_option_cmd(name, cs)) +def set_option(name: str, cs: ChangeSet, update_v3: bool = True) -> ChangeSet: + v2 = set_option_cmd(name, cs) + result = execute_command(name, v2) + if update_v3: + v3 = generate_v3(ChangeSet(v2.redo_cs[0])) + result.merge(set_option_v3(name, v3, False)) + return result #-------------------------------------------------------------- diff --git a/api/s23_options_v3.py b/api/s23_options_v3.py index fdd233f..cb00d15 100644 --- a/api/s23_options_v3.py +++ b/api/s23_options_v3.py @@ -5,7 +5,7 @@ from .s23_options import OPTION_HEADLOSS_HW, OPTION_HEADLOSS_DW, OPTION_HEADLOSS from .s23_options import OPTION_UNBALANCED_STOP, OPTION_UNBALANCED_CONTINUE from .s23_options import OPTION_QUALITY_NONE, OPTION_QUALITY_CHEMICAL, OPTION_QUALITY_AGE, OPTION_QUALITY_TRACE from .s23_options import element_schema -from .s23_options import get_option_schema +from .s23_options import get_option_schema, set_option from .s23_options_util import generate_v2, generate_v3 OPTION_V3_FLOW_UNITS_CFS = OPTION_UNITS_CFS @@ -128,8 +128,13 @@ def set_option_v3_cmd(name: str, cs: ChangeSet) -> DbChangeSet: return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) -def set_option_v3(name: str, cs: ChangeSet) -> ChangeSet: - return execute_command(name, set_option_v3_cmd(name, cs)) +def set_option_v3(name: str, cs: ChangeSet, update_v2: bool = True) -> ChangeSet: + v3 = set_option_v3_cmd(name, cs) + result = execute_command(name, v3) + if update_v2: + v2 = generate_v2(ChangeSet(v3.redo_cs[0])) + result.merge(set_option(name, v2, False)) + return result def _parse_v2(v2_lines: list[str]) -> dict[str, str]: From 3c3c29de90ad0aa80095bde3c0982bd3d2c2344e Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 8 Mar 2023 22:43:21 +0800 Subject: [PATCH 31/42] Code refactor for option --- api/__init__.py | 36 +++--- api/s23_options.py | 152 ++--------------------- api/s23_options_util.py | 261 ++++++++++++++++++++++++++++++++++++++++ api/s23_options_v3.py | 138 ++------------------- 4 files changed, 294 insertions(+), 293 deletions(-) diff --git a/api/__init__.py b/api/__init__.py index 4e6f570..7126da2 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -89,24 +89,26 @@ from .s20_mixing import get_mixing_schema, get_mixing, set_mixing, add_mixing, d from .s21_times import TIME_STATISTIC_NONE, TIME_STATISTIC_AVERAGED, TIME_STATISTIC_MINIMUM, TIME_STATISTIC_MAXIMUM, TIME_STATISTIC_RANGE from .s21_times import get_time_schema, get_time, set_time -from .s23_options import OPTION_UNITS_CFS, OPTION_UNITS_GPM, OPTION_UNITS_MGD, OPTION_UNITS_IMGD, OPTION_UNITS_AFD, OPTION_UNITS_LPS, OPTION_UNITS_LPM, OPTION_UNITS_MLD, OPTION_UNITS_CMH, OPTION_UNITS_CMD -from .s23_options import OPTION_PRESSURE_PSI, OPTION_PRESSURE_KPA, OPTION_PRESSURE_M -from .s23_options import OPTION_HEADLOSS_HW, OPTION_HEADLOSS_DW, OPTION_HEADLOSS_CM -from .s23_options import OPTION_UNBALANCED_STOP, OPTION_UNBALANCED_CONTINUE -from .s23_options import OPTION_DEMAND_MODEL_DDA, OPTION_DEMAND_MODEL_PDA -from .s23_options import OPTION_QUALITY_NONE, OPTION_QUALITY_CHEMICAL, OPTION_QUALITY_AGE, OPTION_QUALITY_TRACE -from .s23_options import get_option_schema, get_option, set_option +from .s23_options_util import OPTION_UNITS_CFS, OPTION_UNITS_GPM, OPTION_UNITS_MGD, OPTION_UNITS_IMGD, OPTION_UNITS_AFD, OPTION_UNITS_LPS, OPTION_UNITS_LPM, OPTION_UNITS_MLD, OPTION_UNITS_CMH, OPTION_UNITS_CMD +from .s23_options_util import OPTION_PRESSURE_PSI, OPTION_PRESSURE_KPA, OPTION_PRESSURE_M +from .s23_options_util import OPTION_HEADLOSS_HW, OPTION_HEADLOSS_DW, OPTION_HEADLOSS_CM +from .s23_options_util import OPTION_UNBALANCED_STOP, OPTION_UNBALANCED_CONTINUE +from .s23_options_util import OPTION_DEMAND_MODEL_DDA, OPTION_DEMAND_MODEL_PDA +from .s23_options_util import OPTION_QUALITY_NONE, OPTION_QUALITY_CHEMICAL, OPTION_QUALITY_AGE, OPTION_QUALITY_TRACE +from .s23_options_util import get_option_schema, get_option +from .s23_options import set_option -from .s23_options_v3 import OPTION_V3_FLOW_UNITS_CFS, OPTION_V3_FLOW_UNITS_GPM, OPTION_V3_FLOW_UNITS_MGD, OPTION_V3_FLOW_UNITS_IMGD, OPTION_V3_FLOW_UNITS_AFD, OPTION_V3_FLOW_UNITS_LPS, OPTION_V3_FLOW_UNITS_LPM, OPTION_V3_FLOW_UNITS_MLD, OPTION_V3_FLOW_UNITS_CMH, OPTION_V3_FLOW_UNITS_CMD -from .s23_options_v3 import OPTION_V3_PRESSURE_UNITS_PSI, OPTION_V3_PRESSURE_UNITS_KPA, OPTION_V3_PRESSURE_UNITS_M -from .s23_options_v3 import OPTION_V3_HEADLOSS_MODEL_HW, OPTION_V3_HEADLOSS_MODEL_DW, OPTION_V3_HEADLOSS_MODEL_CM -from .s23_options_v3 import OPTION_V3_STEP_SIZING, OPTION_V3_STEP_SIZING, OPTION_V3_STEP_SIZING -from .s23_options_v3 import OPTION_V3_IF_UNBALANCED_STOP, OPTION_V3_IF_UNBALANCED_CONTINUE -from .s23_options_v3 import OPTION_V3_DEMAND_MODEL_FIXED, OPTION_V3_DEMAND_MODEL_CONSTRAINED, OPTION_V3_DEMAND_MODEL_POWER, OPTION_V3_DEMAND_MODEL_LOGISTIC -from .s23_options_v3 import OPTION_V3_LEAKAGE_MODEL_NONE, OPTION_V3_LEAKAGE_MODEL_POWER, OPTION_V3_LEAKAGE_MODEL_FAVAD -from .s23_options_v3 import OPTION_V3_QUALITY_MODEL_NONE, OPTION_V3_QUALITY_MODEL_CHEMICAL, OPTION_V3_QUALITY_MODEL_AGE, OPTION_V3_QUALITY_MODEL_TRACE -from .s23_options_v3 import OPTION_V3_QUALITY_UNITS_HRS, OPTION_V3_QUALITY_UNITS_PCNT, OPTION_V3_QUALITY_UNITS_MGL, OPTION_V3_QUALITY_UNITS_UGL -from .s23_options_v3 import get_option_v3_schema, get_option_v3, set_option_v3 +from .s23_options_util import OPTION_V3_FLOW_UNITS_CFS, OPTION_V3_FLOW_UNITS_GPM, OPTION_V3_FLOW_UNITS_MGD, OPTION_V3_FLOW_UNITS_IMGD, OPTION_V3_FLOW_UNITS_AFD, OPTION_V3_FLOW_UNITS_LPS, OPTION_V3_FLOW_UNITS_LPM, OPTION_V3_FLOW_UNITS_MLD, OPTION_V3_FLOW_UNITS_CMH, OPTION_V3_FLOW_UNITS_CMD +from .s23_options_util import OPTION_V3_PRESSURE_UNITS_PSI, OPTION_V3_PRESSURE_UNITS_KPA, OPTION_V3_PRESSURE_UNITS_M +from .s23_options_util import OPTION_V3_HEADLOSS_MODEL_HW, OPTION_V3_HEADLOSS_MODEL_DW, OPTION_V3_HEADLOSS_MODEL_CM +from .s23_options_util import OPTION_V3_STEP_SIZING, OPTION_V3_STEP_SIZING, OPTION_V3_STEP_SIZING +from .s23_options_util import OPTION_V3_IF_UNBALANCED_STOP, OPTION_V3_IF_UNBALANCED_CONTINUE +from .s23_options_util import OPTION_V3_DEMAND_MODEL_FIXED, OPTION_V3_DEMAND_MODEL_CONSTRAINED, OPTION_V3_DEMAND_MODEL_POWER, OPTION_V3_DEMAND_MODEL_LOGISTIC +from .s23_options_util import OPTION_V3_LEAKAGE_MODEL_NONE, OPTION_V3_LEAKAGE_MODEL_POWER, OPTION_V3_LEAKAGE_MODEL_FAVAD +from .s23_options_util import OPTION_V3_QUALITY_MODEL_NONE, OPTION_V3_QUALITY_MODEL_CHEMICAL, OPTION_V3_QUALITY_MODEL_AGE, OPTION_V3_QUALITY_MODEL_TRACE +from .s23_options_util import OPTION_V3_QUALITY_UNITS_HRS, OPTION_V3_QUALITY_UNITS_PCNT, OPTION_V3_QUALITY_UNITS_MGL, OPTION_V3_QUALITY_UNITS_UGL +from .s23_options_util import get_option_v3_schema, get_option_v3 +from .s23_options_v3 import set_option_v3 from .s24_coordinates import get_node_coord diff --git a/api/s23_options.py b/api/s23_options.py index 252d50c..4a839aa 100644 --- a/api/s23_options.py +++ b/api/s23_options.py @@ -1,156 +1,18 @@ from .database import * -from .s23_options_v3 import set_option_v3 -from .s23_options_util import generate_v3 +from .s23_options_util import get_option_schema, set_option_cmd, set_option_v3_cmd, generate_v3 -OPTION_UNITS_CFS = 'CFS' -OPTION_UNITS_GPM = 'GPM' -OPTION_UNITS_MGD = 'MGD' -OPTION_UNITS_IMGD = 'IMGD' -OPTION_UNITS_AFD = 'AFD' -OPTION_UNITS_LPS = 'LPS' -OPTION_UNITS_LPM = 'LPM' -OPTION_UNITS_MLD = 'MLD' -OPTION_UNITS_CMH = 'CMH' -OPTION_UNITS_CMD = 'CMD' +def set_option(name: str, cs: ChangeSet) -> ChangeSet: + v2_cmd = set_option_cmd(name, cs) + result = execute_command(name, v2_cmd) -OPTION_PRESSURE_PSI = 'PSI' -OPTION_PRESSURE_KPA = 'KPA' -OPTION_PRESSURE_M = 'M' + v3 = generate_v3(ChangeSet(v2_cmd.redo_cs[0])) + v3_cmd = set_option_v3_cmd(name, v3) + result.merge(execute_command(name, v3_cmd)) -OPTION_HEADLOSS_HW = 'H-W' -OPTION_HEADLOSS_DW = 'D-W' -OPTION_HEADLOSS_CM = 'C-M' - -OPTION_UNBALANCED_STOP = 'STOP' -OPTION_UNBALANCED_CONTINUE = 'CONTINUE' - -OPTION_DEMAND_MODEL_DDA = 'DDA' -OPTION_DEMAND_MODEL_PDA = 'PDA' - -OPTION_QUALITY_NONE = 'NONE' -OPTION_QUALITY_CHEMICAL = 'CHEMICAL' -OPTION_QUALITY_AGE = 'AGE' -OPTION_QUALITY_TRACE = 'TRACE' - - -element_schema = {'type': 'str' , 'optional': True , 'readonly': False} - - -def get_option_schema(name: str) -> dict[str, dict[str, Any]]: - return { 'UNITS' : element_schema, - 'PRESSURE' : element_schema, - 'HEADLOSS' : element_schema, - 'QUALITY' : element_schema, - 'UNBALANCED' : element_schema, - 'PATTERN' : element_schema, - 'DEMAND MODEL' : element_schema, - 'DEMAND MULTIPLIER' : element_schema, - 'EMITTER EXPONENT' : element_schema, - 'VISCOSITY' : element_schema, - 'DIFFUSIVITY' : element_schema, - 'SPECIFIC GRAVITY' : element_schema, - 'TRIALS' : element_schema, - 'ACCURACY' : element_schema, - 'HEADERROR' : element_schema, - 'FLOWCHANGE' : element_schema, - 'MINIMUM PRESSURE' : element_schema, - 'REQUIRED PRESSURE' : element_schema, - 'PRESSURE EXPONENT' : element_schema, - 'TOLERANCE' : element_schema, - 'HTOL' : element_schema, - 'QTOL' : element_schema, - 'RQTOL' : element_schema, - 'CHECKFREQ' : element_schema, - 'MAXCHECK' : element_schema, - 'DAMPLIMIT' : element_schema } - - -def get_option(name: str) -> dict[str, Any]: - ts = read_all(name, f"select * from options") - d = {} - for e in ts: - d[e['key']] = str(e['value']) - return d - - -def set_option_cmd(name: str, cs: ChangeSet) -> DbChangeSet: - raw_old = get_option(name) - - old = {} - new = {} - - new_dict = cs.operations[0] - schema = get_option_schema(name) - for key in schema.keys(): - if key in new_dict: - old[key] = str(raw_old[key]) - new[key] = str(new_dict[key]) - - redo_cs = g_update_prefix | { 'type' : 'option' } - - redo_sql = '' - for key, value in new.items(): - if redo_sql != '': - redo_sql += '\n' - redo_sql += f"update options set value = '{value}' where key = '{key}';" - redo_cs |= { key: value } - - undo_cs = g_update_prefix | { 'type' : 'option' } - - undo_sql = '' - for key, value in old.items(): - if undo_sql != '': - undo_sql += '\n' - undo_sql += f"update options set value = '{value}' where key = '{key}';" - undo_cs |= { key: value } - - return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) - - -def set_option(name: str, cs: ChangeSet, update_v3: bool = True) -> ChangeSet: - v2 = set_option_cmd(name, cs) - result = execute_command(name, v2) - if update_v3: - v3 = generate_v3(ChangeSet(v2.redo_cs[0])) - result.merge(set_option_v3(name, v3, False)) return result -#-------------------------------------------------------------- -# [EPANET2][IN][OUT] -# UNITS CFS/GPM/MGD/IMGD/AFD/LPS/LPM/MLD/CMH/CMD/SI -# PRESSURE PSI/KPA/M -# HEADLOSS H-W/D-W/C-M -# QUALITY NONE/AGE/TRACE/CHEMICAL (TraceNode) -# UNBALANCED STOP/CONTINUE {Niter} -# PATTERN id -# DEMAND MODEL DDA/PDA -# DEMAND MULTIPLIER value -# EMITTER EXPONENT value -# VISCOSITY value -# DIFFUSIVITY value -# SPECIFIC GRAVITY value -# TRIALS value -# ACCURACY value# -# HEADERROR value -# FLOWCHANGE value -# MINIMUM PRESSURE value -# REQUIRED PRESSURE value -# PRESSURE EXPONENT value# -# TOLERANCE value -# HTOL value -# QTOL value -# RQTOL value -# CHECKFREQ value -# MAXCHECK value -# DAMPLIMIT value -# ---- Unsupported Options ----- -# HYDRAULICS USE/SAVE filename -# MAP filename -#-------------------------------------------------------------- - - def inp_in_option(section: list[str]) -> ChangeSet: if len(section) <= 0: return ChangeSet() diff --git a/api/s23_options_util.py b/api/s23_options_util.py index 2244c25..0285a12 100644 --- a/api/s23_options_util.py +++ b/api/s23_options_util.py @@ -1,5 +1,265 @@ from .database import * + +#-------------------------------------------------------------- +# [EPANET2][IN][OUT] +# UNITS CFS/GPM/MGD/IMGD/AFD/LPS/LPM/MLD/CMH/CMD/SI +# PRESSURE PSI/KPA/M +# HEADLOSS H-W/D-W/C-M +# QUALITY NONE/AGE/TRACE/CHEMICAL (TraceNode) +# UNBALANCED STOP/CONTINUE {Niter} +# PATTERN id +# DEMAND MODEL DDA/PDA +# DEMAND MULTIPLIER value +# EMITTER EXPONENT value +# VISCOSITY value +# DIFFUSIVITY value +# SPECIFIC GRAVITY value +# TRIALS value +# ACCURACY value# +# HEADERROR value +# FLOWCHANGE value +# MINIMUM PRESSURE value +# REQUIRED PRESSURE value +# PRESSURE EXPONENT value# +# TOLERANCE value +# HTOL value +# QTOL value +# RQTOL value +# CHECKFREQ value +# MAXCHECK value +# DAMPLIMIT value +# ---- Unsupported Options ----- +# HYDRAULICS USE/SAVE filename +# MAP filename +#-------------------------------------------------------------- + + +element_schema = {'type': 'str' , 'optional': True , 'readonly': False} + + +OPTION_UNITS_CFS = 'CFS' +OPTION_UNITS_GPM = 'GPM' +OPTION_UNITS_MGD = 'MGD' +OPTION_UNITS_IMGD = 'IMGD' +OPTION_UNITS_AFD = 'AFD' +OPTION_UNITS_LPS = 'LPS' +OPTION_UNITS_LPM = 'LPM' +OPTION_UNITS_MLD = 'MLD' +OPTION_UNITS_CMH = 'CMH' +OPTION_UNITS_CMD = 'CMD' + +OPTION_PRESSURE_PSI = 'PSI' +OPTION_PRESSURE_KPA = 'KPA' +OPTION_PRESSURE_M = 'M' + +OPTION_HEADLOSS_HW = 'H-W' +OPTION_HEADLOSS_DW = 'D-W' +OPTION_HEADLOSS_CM = 'C-M' + +OPTION_UNBALANCED_STOP = 'STOP' +OPTION_UNBALANCED_CONTINUE = 'CONTINUE' + +OPTION_DEMAND_MODEL_DDA = 'DDA' +OPTION_DEMAND_MODEL_PDA = 'PDA' + +OPTION_QUALITY_NONE = 'NONE' +OPTION_QUALITY_CHEMICAL = 'CHEMICAL' +OPTION_QUALITY_AGE = 'AGE' +OPTION_QUALITY_TRACE = 'TRACE' + + +def get_option_schema(name: str) -> dict[str, dict[str, Any]]: + return { 'UNITS' : element_schema, + 'PRESSURE' : element_schema, + 'HEADLOSS' : element_schema, + 'QUALITY' : element_schema, + 'UNBALANCED' : element_schema, + 'PATTERN' : element_schema, + 'DEMAND MODEL' : element_schema, + 'DEMAND MULTIPLIER' : element_schema, + 'EMITTER EXPONENT' : element_schema, + 'VISCOSITY' : element_schema, + 'DIFFUSIVITY' : element_schema, + 'SPECIFIC GRAVITY' : element_schema, + 'TRIALS' : element_schema, + 'ACCURACY' : element_schema, + 'HEADERROR' : element_schema, + 'FLOWCHANGE' : element_schema, + 'MINIMUM PRESSURE' : element_schema, + 'REQUIRED PRESSURE' : element_schema, + 'PRESSURE EXPONENT' : element_schema, + 'TOLERANCE' : element_schema, + 'HTOL' : element_schema, + 'QTOL' : element_schema, + 'RQTOL' : element_schema, + 'CHECKFREQ' : element_schema, + 'MAXCHECK' : element_schema, + 'DAMPLIMIT' : element_schema } + + +def get_option(name: str) -> dict[str, Any]: + ts = read_all(name, f"select * from options") + d = {} + for e in ts: + d[e['key']] = str(e['value']) + return d + + +def set_option_cmd(name: str, cs: ChangeSet) -> DbChangeSet: + raw_old = get_option(name) + + old = {} + new = {} + + new_dict = cs.operations[0] + schema = get_option_schema(name) + for key in schema.keys(): + if key in new_dict: + old[key] = str(raw_old[key]) + new[key] = str(new_dict[key]) + + redo_cs = g_update_prefix | { 'type' : 'option' } + + redo_sql = '' + for key, value in new.items(): + if redo_sql != '': + redo_sql += '\n' + redo_sql += f"update options set value = '{value}' where key = '{key}';" + redo_cs |= { key: value } + + undo_cs = g_update_prefix | { 'type' : 'option' } + + undo_sql = '' + for key, value in old.items(): + if undo_sql != '': + undo_sql += '\n' + undo_sql += f"update options set value = '{value}' where key = '{key}';" + undo_cs |= { key: value } + + return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) + + +OPTION_V3_FLOW_UNITS_CFS = OPTION_UNITS_CFS +OPTION_V3_FLOW_UNITS_GPM = OPTION_UNITS_GPM +OPTION_V3_FLOW_UNITS_MGD = OPTION_UNITS_MGD +OPTION_V3_FLOW_UNITS_IMGD = OPTION_UNITS_IMGD +OPTION_V3_FLOW_UNITS_AFD = OPTION_UNITS_AFD +OPTION_V3_FLOW_UNITS_LPS = OPTION_UNITS_LPS +OPTION_V3_FLOW_UNITS_LPM = OPTION_UNITS_LPM +OPTION_V3_FLOW_UNITS_MLD = OPTION_UNITS_MLD +OPTION_V3_FLOW_UNITS_CMH = OPTION_UNITS_CMH +OPTION_V3_FLOW_UNITS_CMD = OPTION_UNITS_CMD + +OPTION_V3_PRESSURE_UNITS_PSI = OPTION_PRESSURE_PSI +OPTION_V3_PRESSURE_UNITS_KPA = OPTION_PRESSURE_KPA +OPTION_V3_PRESSURE_UNITS_M = OPTION_PRESSURE_M + +OPTION_V3_HEADLOSS_MODEL_HW = OPTION_HEADLOSS_HW +OPTION_V3_HEADLOSS_MODEL_DW = OPTION_HEADLOSS_DW +OPTION_V3_HEADLOSS_MODEL_CM = OPTION_HEADLOSS_CM + +OPTION_V3_STEP_SIZING = 'FULL' +OPTION_V3_STEP_SIZING = 'RELAXATION' +OPTION_V3_STEP_SIZING = 'LINESEARCH' + +OPTION_V3_IF_UNBALANCED_STOP = OPTION_UNBALANCED_STOP +OPTION_V3_IF_UNBALANCED_CONTINUE = OPTION_UNBALANCED_CONTINUE + +OPTION_V3_DEMAND_MODEL_FIXED = 'FIXED' +OPTION_V3_DEMAND_MODEL_CONSTRAINED = 'CONSTRAINED' +OPTION_V3_DEMAND_MODEL_POWER = 'POWER' +OPTION_V3_DEMAND_MODEL_LOGISTIC = 'LOGISTIC' + +OPTION_V3_LEAKAGE_MODEL_NONE = 'NONE' +OPTION_V3_LEAKAGE_MODEL_POWER = 'POWER' +OPTION_V3_LEAKAGE_MODEL_FAVAD = 'FAVAD' + +OPTION_V3_QUALITY_MODEL_NONE = OPTION_QUALITY_NONE +OPTION_V3_QUALITY_MODEL_CHEMICAL = OPTION_QUALITY_CHEMICAL +OPTION_V3_QUALITY_MODEL_AGE = OPTION_QUALITY_AGE +OPTION_V3_QUALITY_MODEL_TRACE = OPTION_QUALITY_TRACE + +OPTION_V3_QUALITY_UNITS_HRS = 'HRS' +OPTION_V3_QUALITY_UNITS_PCNT = 'PCNT' +OPTION_V3_QUALITY_UNITS_MGL = 'MG/L' +OPTION_V3_QUALITY_UNITS_UGL = 'UG/L' + + +def get_option_v3_schema(name: str) -> dict[str, dict[str, Any]]: + return { 'FLOW_UNITS' : element_schema, + 'PRESSURE_UNITS' : element_schema, + 'HEADLOSS_MODEL' : element_schema, + 'SPECIFIC_GRAVITY' : element_schema, + 'SPECIFIC_VISCOSITY' : element_schema, + 'MAXIMUM_TRIALS' : element_schema, + 'HEAD_TOLERANCE' : element_schema, + 'FLOW_TOLERANCE' : element_schema, + 'FLOW_CHANGE_LIMIT' : element_schema, + 'RELATIVE_ACCURACY' : element_schema, + 'TIME_WEIGHT' : element_schema, + 'STEP_SIZING' : element_schema, + 'IF_UNBALANCED' : element_schema, + 'DEMAND_MODEL' : element_schema, + 'DEMAND_PATTERN' : element_schema, + 'DEMAND_MULTIPLIER' : element_schema, + 'MINIMUM_PRESSURE' : element_schema, + 'SERVICE_PRESSURE' : element_schema, + 'PRESSURE_EXPONENT' : element_schema, + 'LEAKAGE_MODEL' : element_schema, + 'LEAKAGE_COEFF1' : element_schema, + 'LEAKAGE_COEFF2' : element_schema, + 'EMITTER_EXPONENT' : element_schema, + 'QUALITY_MODEL' : element_schema, + 'QUALITY_NAME' : element_schema, + 'QUALITY_UNITS' : element_schema, + 'TRACE_NODE' : element_schema, + 'SPECIFIC_DIFFUSIVITY' : element_schema, + 'QUALITY_TOLERANCE' : element_schema } + + +def get_option_v3(name: str) -> dict[str, Any]: + ts = read_all(name, f"select * from options_v3") + d = {} + for e in ts: + d[e['key']] = str(e['value']) + return d + + +def set_option_v3_cmd(name: str, cs: ChangeSet) -> DbChangeSet: + raw_old = get_option_v3(name) + + old = {} + new = {} + + new_dict = cs.operations[0] + schema = get_option_v3_schema(name) + for key in schema.keys(): + if key in new_dict: + old[key] = str(raw_old[key]) + new[key] = str(new_dict[key]) + + redo_cs = g_update_prefix | { 'type' : 'option_v3' } + + redo_sql = '' + for key, value in new.items(): + if redo_sql != '': + redo_sql += '\n' + redo_sql += f"update options_v3 set value = '{value}' where key = '{key}';" + redo_cs |= { key: value } + + undo_cs = g_update_prefix | { 'type' : 'option_v3' } + + undo_sql = '' + for key, value in old.items(): + if undo_sql != '': + undo_sql += '\n' + undo_sql += f"update options_v3 set value = '{value}' where key = '{key}';" + undo_cs |= { key: value } + + return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) + + _key_map_23 = { 'UNITS' : 'FLOW_UNITS', 'PRESSURE' : 'PRESSURE_UNITS', @@ -127,3 +387,4 @@ def generate_v3(cs: ChangeSet) -> ChangeSet: return ChangeSet(cs_v3) return ChangeSet() + diff --git a/api/s23_options_v3.py b/api/s23_options_v3.py index cb00d15..c2228a5 100644 --- a/api/s23_options_v3.py +++ b/api/s23_options_v3.py @@ -1,139 +1,15 @@ from .database import * -from .s23_options import OPTION_UNITS_CFS, OPTION_UNITS_GPM, OPTION_UNITS_MGD, OPTION_UNITS_IMGD, OPTION_UNITS_AFD, OPTION_UNITS_LPS, OPTION_UNITS_LPM, OPTION_UNITS_MLD, OPTION_UNITS_CMH, OPTION_UNITS_CMD -from .s23_options import OPTION_PRESSURE_PSI, OPTION_PRESSURE_KPA, OPTION_PRESSURE_M -from .s23_options import OPTION_HEADLOSS_HW, OPTION_HEADLOSS_DW, OPTION_HEADLOSS_CM -from .s23_options import OPTION_UNBALANCED_STOP, OPTION_UNBALANCED_CONTINUE -from .s23_options import OPTION_QUALITY_NONE, OPTION_QUALITY_CHEMICAL, OPTION_QUALITY_AGE, OPTION_QUALITY_TRACE -from .s23_options import element_schema -from .s23_options import get_option_schema, set_option -from .s23_options_util import generate_v2, generate_v3 - -OPTION_V3_FLOW_UNITS_CFS = OPTION_UNITS_CFS -OPTION_V3_FLOW_UNITS_GPM = OPTION_UNITS_GPM -OPTION_V3_FLOW_UNITS_MGD = OPTION_UNITS_MGD -OPTION_V3_FLOW_UNITS_IMGD = OPTION_UNITS_IMGD -OPTION_V3_FLOW_UNITS_AFD = OPTION_UNITS_AFD -OPTION_V3_FLOW_UNITS_LPS = OPTION_UNITS_LPS -OPTION_V3_FLOW_UNITS_LPM = OPTION_UNITS_LPM -OPTION_V3_FLOW_UNITS_MLD = OPTION_UNITS_MLD -OPTION_V3_FLOW_UNITS_CMH = OPTION_UNITS_CMH -OPTION_V3_FLOW_UNITS_CMD = OPTION_UNITS_CMD - -OPTION_V3_PRESSURE_UNITS_PSI = OPTION_PRESSURE_PSI -OPTION_V3_PRESSURE_UNITS_KPA = OPTION_PRESSURE_KPA -OPTION_V3_PRESSURE_UNITS_M = OPTION_PRESSURE_M - -OPTION_V3_HEADLOSS_MODEL_HW = OPTION_HEADLOSS_HW -OPTION_V3_HEADLOSS_MODEL_DW = OPTION_HEADLOSS_DW -OPTION_V3_HEADLOSS_MODEL_CM = OPTION_HEADLOSS_CM - -OPTION_V3_STEP_SIZING = 'FULL' -OPTION_V3_STEP_SIZING = 'RELAXATION' -OPTION_V3_STEP_SIZING = 'LINESEARCH' - -OPTION_V3_IF_UNBALANCED_STOP = OPTION_UNBALANCED_STOP -OPTION_V3_IF_UNBALANCED_CONTINUE = OPTION_UNBALANCED_CONTINUE - -OPTION_V3_DEMAND_MODEL_FIXED = 'FIXED' -OPTION_V3_DEMAND_MODEL_CONSTRAINED = 'CONSTRAINED' -OPTION_V3_DEMAND_MODEL_POWER = 'POWER' -OPTION_V3_DEMAND_MODEL_LOGISTIC = 'LOGISTIC' - -OPTION_V3_LEAKAGE_MODEL_NONE = 'NONE' -OPTION_V3_LEAKAGE_MODEL_POWER = 'POWER' -OPTION_V3_LEAKAGE_MODEL_FAVAD = 'FAVAD' - -OPTION_V3_QUALITY_MODEL_NONE = OPTION_QUALITY_NONE -OPTION_V3_QUALITY_MODEL_CHEMICAL = OPTION_QUALITY_CHEMICAL -OPTION_V3_QUALITY_MODEL_AGE = OPTION_QUALITY_AGE -OPTION_V3_QUALITY_MODEL_TRACE = OPTION_QUALITY_TRACE - -OPTION_V3_QUALITY_UNITS_HRS = 'HRS' -OPTION_V3_QUALITY_UNITS_PCNT = 'PCNT' -OPTION_V3_QUALITY_UNITS_MGL = 'MG/L' -OPTION_V3_QUALITY_UNITS_UGL = 'UG/L' +from .s23_options_util import get_option_schema, get_option_v3_schema, set_option_v3_cmd, set_option_cmd, generate_v2, generate_v3 -def get_option_v3_schema(name: str) -> dict[str, dict[str, Any]]: - return { 'FLOW_UNITS' : element_schema, - 'PRESSURE_UNITS' : element_schema, - 'HEADLOSS_MODEL' : element_schema, - 'SPECIFIC_GRAVITY' : element_schema, - 'SPECIFIC_VISCOSITY' : element_schema, - 'MAXIMUM_TRIALS' : element_schema, - 'HEAD_TOLERANCE' : element_schema, - 'FLOW_TOLERANCE' : element_schema, - 'FLOW_CHANGE_LIMIT' : element_schema, - 'RELATIVE_ACCURACY' : element_schema, - 'TIME_WEIGHT' : element_schema, - 'STEP_SIZING' : element_schema, - 'IF_UNBALANCED' : element_schema, - 'DEMAND_MODEL' : element_schema, - 'DEMAND_PATTERN' : element_schema, - 'DEMAND_MULTIPLIER' : element_schema, - 'MINIMUM_PRESSURE' : element_schema, - 'SERVICE_PRESSURE' : element_schema, - 'PRESSURE_EXPONENT' : element_schema, - 'LEAKAGE_MODEL' : element_schema, - 'LEAKAGE_COEFF1' : element_schema, - 'LEAKAGE_COEFF2' : element_schema, - 'EMITTER_EXPONENT' : element_schema, - 'QUALITY_MODEL' : element_schema, - 'QUALITY_NAME' : element_schema, - 'QUALITY_UNITS' : element_schema, - 'TRACE_NODE' : element_schema, - 'SPECIFIC_DIFFUSIVITY' : element_schema, - 'QUALITY_TOLERANCE' : element_schema } +def set_option_v3(name: str, cs: ChangeSet) -> ChangeSet: + v3_cmd = set_option_v3_cmd(name, cs) + result = execute_command(name, v3_cmd) + v2 = generate_v2(ChangeSet(v3_cmd.redo_cs[0])) + v2_cmd = set_option_cmd(name, v2) + result.merge(execute_command(name, v2_cmd)) -def get_option_v3(name: str) -> dict[str, Any]: - ts = read_all(name, f"select * from options_v3") - d = {} - for e in ts: - d[e['key']] = str(e['value']) - return d - - -def set_option_v3_cmd(name: str, cs: ChangeSet) -> DbChangeSet: - raw_old = get_option_v3(name) - - old = {} - new = {} - - new_dict = cs.operations[0] - schema = get_option_v3_schema(name) - for key in schema.keys(): - if key in new_dict: - old[key] = str(raw_old[key]) - new[key] = str(new_dict[key]) - - redo_cs = g_update_prefix | { 'type' : 'option_v3' } - - redo_sql = '' - for key, value in new.items(): - if redo_sql != '': - redo_sql += '\n' - redo_sql += f"update options_v3 set value = '{value}' where key = '{key}';" - redo_cs |= { key: value } - - undo_cs = g_update_prefix | { 'type' : 'option_v3' } - - undo_sql = '' - for key, value in old.items(): - if undo_sql != '': - undo_sql += '\n' - undo_sql += f"update options_v3 set value = '{value}' where key = '{key}';" - undo_cs |= { key: value } - - return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) - - -def set_option_v3(name: str, cs: ChangeSet, update_v2: bool = True) -> ChangeSet: - v3 = set_option_v3_cmd(name, cs) - result = execute_command(name, v3) - if update_v2: - v2 = generate_v2(ChangeSet(v3.redo_cs[0])) - result.merge(set_option(name, v2, False)) return result From 690e3aa09a2354b6f668da77a48fb48f6bde744a Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 8 Mar 2023 22:56:29 +0800 Subject: [PATCH 32/42] Refine option to support batch command --- api/batch_cmd.py | 8 +++++++- api/batch_cmds.py | 7 +++++++ api/s23_options.py | 14 +++++--------- api/s23_options_util.py | 10 ++++++++++ api/s23_options_v3.py | 14 +++++--------- api/sections.py | 1 + 6 files changed, 35 insertions(+), 19 deletions(-) diff --git a/api/batch_cmd.py b/api/batch_cmd.py index 505912e..c6d352f 100644 --- a/api/batch_cmd.py +++ b/api/batch_cmd.py @@ -22,7 +22,7 @@ from .s19_reactions import set_reaction_cmd, set_pipe_reaction_cmd, set_tank_rea from .s20_mixing import set_mixing_cmd, add_mixing_cmd, delete_mixing_cmd from .s21_times import set_time_cmd #from .s22_report import * -from .s23_options import set_option_cmd +from .s23_options_util import set_option_cmd, set_option_v3_cmd #from .s24_coordinates import * from .s25_vertices import set_vertex_cmd, add_vertex_cmd, delete_vertex_cmd from .s26_labels import set_label_cmd, add_label_cmd, delete_label_cmd @@ -89,6 +89,8 @@ def add_cmd(name: str, cs: ChangeSet) -> DbChangeSet | None: return None elif type == s23_option: return None + elif type == s23_option_v3: + return None elif type == s24_coordinate: return None elif type == s25_vertex: @@ -164,6 +166,8 @@ def set_cmd(name: str, cs: ChangeSet) -> DbChangeSet | None: return None elif type == s23_option: return set_option_cmd(name, cs) + elif type == s23_option_v3: + return set_option_v3_cmd(name, cs) elif type == s24_coordinate: # do not support update here return None elif type == s25_vertex: @@ -239,6 +243,8 @@ def del_cmd(name: str, cs: ChangeSet) -> DbChangeSet | None: return None elif type == s23_option: return None + elif type == s23_option_v3: + return None elif type == s24_coordinate: return None elif type == s25_vertex: diff --git a/api/batch_cmds.py b/api/batch_cmds.py index 89625f2..4ee0688 100644 --- a/api/batch_cmds.py +++ b/api/batch_cmds.py @@ -23,6 +23,7 @@ from .s20_mixing import set_mixing, add_mixing, delete_mixing from .s21_times import set_time #from .s22_report import * from .s23_options import set_option +from .s23_options_v3 import set_option_v3 #from .s24_coordinates import * from .s25_vertices import set_vertex, add_vertex, delete_vertex from .s26_labels import set_label, add_label, delete_label @@ -89,6 +90,8 @@ def execute_add_command(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() elif type == s23_option: return ChangeSet() + elif type == s23_option_v3: + return ChangeSet() elif type == s24_coordinate: return ChangeSet() elif type == s25_vertex: @@ -164,6 +167,8 @@ def execute_update_command(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() elif type == s23_option: return set_option(name, cs) + elif type == s23_option_v3: + return set_option_v3(name, cs) elif type == s24_coordinate: # do not support update here return ChangeSet() elif type == s25_vertex: @@ -239,6 +244,8 @@ def execute_delete_command(name: str, cs: ChangeSet) -> ChangeSet: return ChangeSet() elif type == s23_option: return ChangeSet() + elif type == s23_option_v3: + return ChangeSet() elif type == s24_coordinate: return ChangeSet() elif type == s25_vertex: diff --git a/api/s23_options.py b/api/s23_options.py index 4a839aa..3e40c28 100644 --- a/api/s23_options.py +++ b/api/s23_options.py @@ -1,16 +1,12 @@ from .database import * -from .s23_options_util import get_option_schema, set_option_cmd, set_option_v3_cmd, generate_v3 +from .s23_options_util import get_option_schema, generate_v3 +from .batch_cmd import execute_batch_command def set_option(name: str, cs: ChangeSet) -> ChangeSet: - v2_cmd = set_option_cmd(name, cs) - result = execute_command(name, v2_cmd) - - v3 = generate_v3(ChangeSet(v2_cmd.redo_cs[0])) - v3_cmd = set_option_v3_cmd(name, v3) - result.merge(execute_command(name, v3_cmd)) - - return result + new_cs = cs + new_cs.merge(generate_v3(cs)) + return execute_batch_command(name, new_cs) def inp_in_option(section: list[str]) -> ChangeSet: diff --git a/api/s23_options_util.py b/api/s23_options_util.py index 0285a12..c8c8234 100644 --- a/api/s23_options_util.py +++ b/api/s23_options_util.py @@ -140,6 +140,11 @@ def set_option_cmd(name: str, cs: ChangeSet) -> DbChangeSet: return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) +def set_option_only(name: str, cs: ChangeSet) -> ChangeSet: + v2_cmd = set_option_cmd(name, cs) + return execute_command(name, v2_cmd) + + OPTION_V3_FLOW_UNITS_CFS = OPTION_UNITS_CFS OPTION_V3_FLOW_UNITS_GPM = OPTION_UNITS_GPM OPTION_V3_FLOW_UNITS_MGD = OPTION_UNITS_MGD @@ -260,6 +265,11 @@ def set_option_v3_cmd(name: str, cs: ChangeSet) -> DbChangeSet: return DbChangeSet(redo_sql, undo_sql, [redo_cs], [undo_cs]) +def set_option_v3_only(name: str, cs: ChangeSet) -> ChangeSet: + v3_cmd = set_option_v3_cmd(name, cs) + return execute_command(name, v3_cmd) + + _key_map_23 = { 'UNITS' : 'FLOW_UNITS', 'PRESSURE' : 'PRESSURE_UNITS', diff --git a/api/s23_options_v3.py b/api/s23_options_v3.py index c2228a5..1204c9c 100644 --- a/api/s23_options_v3.py +++ b/api/s23_options_v3.py @@ -1,16 +1,12 @@ from .database import * -from .s23_options_util import get_option_schema, get_option_v3_schema, set_option_v3_cmd, set_option_cmd, generate_v2, generate_v3 +from .s23_options_util import get_option_schema, get_option_v3_schema, generate_v2, generate_v3 +from .batch_cmd import execute_batch_command def set_option_v3(name: str, cs: ChangeSet) -> ChangeSet: - v3_cmd = set_option_v3_cmd(name, cs) - result = execute_command(name, v3_cmd) - - v2 = generate_v2(ChangeSet(v3_cmd.redo_cs[0])) - v2_cmd = set_option_cmd(name, v2) - result.merge(execute_command(name, v2_cmd)) - - return result + new_cs = cs + new_cs.merge(generate_v2(cs)) + return execute_batch_command(name, new_cs) def _parse_v2(v2_lines: list[str]) -> dict[str, str]: diff --git a/api/sections.py b/api/sections.py index e36ac0c..b105c92 100644 --- a/api/sections.py +++ b/api/sections.py @@ -24,6 +24,7 @@ s20_mixing = 'mixing' s21_time = 'time' s22_report = 'report' s23_option = 'option' +s23_option_v3 = 'option_v3' s24_coordinate = 'coordinate' s25_vertex = 'vertex' s26_label = 'label' From 9d5db44b22934f6832a5b3230550977ca549c5a0 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 8 Mar 2023 22:59:52 +0800 Subject: [PATCH 33/42] Remove some checking --- api/s23_options_util.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/api/s23_options_util.py b/api/s23_options_util.py index c8c8234..6e9d749 100644 --- a/api/s23_options_util.py +++ b/api/s23_options_util.py @@ -336,9 +336,6 @@ _key_map_32 = { def generate_v2(cs: ChangeSet) -> ChangeSet: op = cs.operations[0] - if op['type'] == 'option': - return cs - map = _key_map_32 cs_v2 = {} @@ -370,9 +367,6 @@ def generate_v2(cs: ChangeSet) -> ChangeSet: def generate_v3(cs: ChangeSet) -> ChangeSet: op = cs.operations[0] - if op['type'] == 'option_v3': - return cs - map = _key_map_23 cs_v3 = {} From 6a9b4ec87c076b81ed6e395b503d508d4d6a64aa Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 8 Mar 2023 23:04:20 +0800 Subject: [PATCH 34/42] Add operation and type since set option is batch command --- api/s23_options.py | 2 ++ api/s23_options_util.py | 6 ++++++ api/s23_options_v3.py | 2 ++ 3 files changed, 10 insertions(+) diff --git a/api/s23_options.py b/api/s23_options.py index 3e40c28..e507812 100644 --- a/api/s23_options.py +++ b/api/s23_options.py @@ -4,6 +4,8 @@ from .batch_cmd import execute_batch_command def set_option(name: str, cs: ChangeSet) -> ChangeSet: + cs.operations[0]['operation'] = API_UPDATE + cs.operations[0]['type'] = 'option' new_cs = cs new_cs.merge(generate_v3(cs)) return execute_batch_command(name, new_cs) diff --git a/api/s23_options_util.py b/api/s23_options_util.py index 6e9d749..c8c8234 100644 --- a/api/s23_options_util.py +++ b/api/s23_options_util.py @@ -336,6 +336,9 @@ _key_map_32 = { def generate_v2(cs: ChangeSet) -> ChangeSet: op = cs.operations[0] + if op['type'] == 'option': + return cs + map = _key_map_32 cs_v2 = {} @@ -367,6 +370,9 @@ def generate_v2(cs: ChangeSet) -> ChangeSet: def generate_v3(cs: ChangeSet) -> ChangeSet: op = cs.operations[0] + if op['type'] == 'option_v3': + return cs + map = _key_map_23 cs_v3 = {} diff --git a/api/s23_options_v3.py b/api/s23_options_v3.py index 1204c9c..5df18fd 100644 --- a/api/s23_options_v3.py +++ b/api/s23_options_v3.py @@ -4,6 +4,8 @@ from .batch_cmd import execute_batch_command def set_option_v3(name: str, cs: ChangeSet) -> ChangeSet: + cs.operations[0]['operation'] = API_UPDATE + cs.operations[0]['type'] = 'option_v3' new_cs = cs new_cs.merge(generate_v2(cs)) return execute_batch_command(name, new_cs) From 6babe1e84c5b3d868dbbf503f1e29a303e0cff59 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 8 Mar 2023 23:09:29 +0800 Subject: [PATCH 35/42] Make use of enum string --- api/s23_options_util.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/api/s23_options_util.py b/api/s23_options_util.py index c8c8234..ce4aac2 100644 --- a/api/s23_options_util.py +++ b/api/s23_options_util.py @@ -350,15 +350,15 @@ def generate_v2(cs: ChangeSet) -> ChangeSet: if key != 'QUALITY_MODEL' and key != 'DEMAND_MODEL': cs_v2 |= { map[key] : op[key] } elif key == 'QUALITY_MODEL': - if str(op[key]).upper() == 'TRACE' and 'TRACE_NODE' in op.keys(): - cs_v2 |= { map[key] : f"TRACE {op['TRACE_NODE']}" } + if str(op[key]).upper() == OPTION_QUALITY_TRACE and 'TRACE_NODE' in op.keys(): + cs_v2 |= { map[key] : f"{OPTION_QUALITY_TRACE} {op['TRACE_NODE']}" } else: cs_v2 |= { map[key] : str(op[key]).upper() } elif key == 'DEMAND_MODEL': - if op[key] == 'FIXED': - cs_v2 |= { map[key] : 'DDA' } + if op[key] == OPTION_V3_DEMAND_MODEL_FIXED: + cs_v2 |= { map[key] : OPTION_DEMAND_MODEL_DDA } else: - cs_v2 |= { map[key] : 'PDA' } + cs_v2 |= { map[key] : OPTION_DEMAND_MODEL_PDA } if len(cs_v2) > 0: cs_v2 |= g_update_prefix | { 'type' : 'option' } @@ -387,10 +387,10 @@ def generate_v3(cs: ChangeSet) -> ChangeSet: tokens = str(op[key]).split() if len(tokens) >= 1: cs_v3 |= { map[key] : tokens[0].upper() } - if tokens[0].upper() == 'TRACE' and len(tokens) >= 2: + if tokens[0].upper() == OPTION_QUALITY_TRACE and len(tokens) >= 2: cs_v3 |= { 'TRACE_NODE' : tokens[1] } elif key == 'DEMAND MODEL': - cs_v3 |= { map[key] : 'POWER' } + cs_v3 |= { map[key] : OPTION_V3_DEMAND_MODEL_POWER } if len(cs_v3) > 0: cs_v3 |= g_update_prefix | { 'type' : 'option_v3' } From 1e51a52e1a94425cb791f7a59f01ec172402ae91 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 8 Mar 2023 23:16:07 +0800 Subject: [PATCH 36/42] Only write out non-empty value --- api/s23_options.py | 2 +- api/s23_options_v3.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/s23_options.py b/api/s23_options.py index e507812..01ec503 100644 --- a/api/s23_options.py +++ b/api/s23_options.py @@ -46,6 +46,6 @@ def inp_out_option(name: str) -> list[str]: for obj in objs: key = obj['key'] value = obj['value'] - if value != '': + if str(value).strip() != '': lines.append(f'{key} {value}') return lines diff --git a/api/s23_options_v3.py b/api/s23_options_v3.py index 5df18fd..65e2691 100644 --- a/api/s23_options_v3.py +++ b/api/s23_options_v3.py @@ -64,6 +64,6 @@ def inp_out_option_v3(name: str) -> list[str]: for obj in objs: key = obj['key'] value = obj['value'] - if value != '': + if str(value).strip() != '': lines.append(f'{key} {value}') return lines From 6fa23ac25326a9fbb0f51c0f21b6927dacacdc7d Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 8 Mar 2023 23:28:24 +0800 Subject: [PATCH 37/42] Add default value for demand pattern --- script/sql/create/23.options.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/sql/create/23.options.sql b/script/sql/create/23.options.sql index 24de9e3..38a37a3 100644 --- a/script/sql/create/23.options.sql +++ b/script/sql/create/23.options.sql @@ -59,7 +59,7 @@ insert into options_v3 (key, value) values , ('STEP_SIZING', 'FULL') , ('IF_UNBALANCED', 'STOP') , ('DEMAND_MODEL', 'FIXED') -, ('DEMAND_PATTERN', ' ') +, ('DEMAND_PATTERN', '1') , ('DEMAND_MULTIPLIER', '1.0') , ('MINIMUM_PRESSURE', '0.0') , ('SERVICE_PRESSURE', '0.0') @@ -71,7 +71,7 @@ insert into options_v3 (key, value) values , ('QUALITY_MODEL', 'NONE') , ('QUALITY_NAME', 'Chemical') , ('QUALITY_UNITS', 'MG/L') -, ('TRACE_NODE', ' ') +, ('TRACE_NODE', '') , ('SPECIFIC_DIFFUSIVITY', '1.0') , ('QUALITY_TOLERANCE', '0.01') ; From a9008b3a86cadb0f2cc00400f9a060156f0a1cbe Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Wed, 8 Mar 2023 23:28:36 +0800 Subject: [PATCH 38/42] Fix typo --- api/__init__.py | 2 +- api/s23_options_util.py | 6 +++--- tjnetwork.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/__init__.py b/api/__init__.py index 7126da2..51b7fb8 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -101,7 +101,7 @@ from .s23_options import set_option from .s23_options_util import OPTION_V3_FLOW_UNITS_CFS, OPTION_V3_FLOW_UNITS_GPM, OPTION_V3_FLOW_UNITS_MGD, OPTION_V3_FLOW_UNITS_IMGD, OPTION_V3_FLOW_UNITS_AFD, OPTION_V3_FLOW_UNITS_LPS, OPTION_V3_FLOW_UNITS_LPM, OPTION_V3_FLOW_UNITS_MLD, OPTION_V3_FLOW_UNITS_CMH, OPTION_V3_FLOW_UNITS_CMD from .s23_options_util import OPTION_V3_PRESSURE_UNITS_PSI, OPTION_V3_PRESSURE_UNITS_KPA, OPTION_V3_PRESSURE_UNITS_M from .s23_options_util import OPTION_V3_HEADLOSS_MODEL_HW, OPTION_V3_HEADLOSS_MODEL_DW, OPTION_V3_HEADLOSS_MODEL_CM -from .s23_options_util import OPTION_V3_STEP_SIZING, OPTION_V3_STEP_SIZING, OPTION_V3_STEP_SIZING +from .s23_options_util import OPTION_V3_STEP_SIZING_FULL, OPTION_V3_STEP_SIZING_RELAXATION, OPTION_V3_STEP_SIZING_LINESEARCH from .s23_options_util import OPTION_V3_IF_UNBALANCED_STOP, OPTION_V3_IF_UNBALANCED_CONTINUE from .s23_options_util import OPTION_V3_DEMAND_MODEL_FIXED, OPTION_V3_DEMAND_MODEL_CONSTRAINED, OPTION_V3_DEMAND_MODEL_POWER, OPTION_V3_DEMAND_MODEL_LOGISTIC from .s23_options_util import OPTION_V3_LEAKAGE_MODEL_NONE, OPTION_V3_LEAKAGE_MODEL_POWER, OPTION_V3_LEAKAGE_MODEL_FAVAD diff --git a/api/s23_options_util.py b/api/s23_options_util.py index ce4aac2..79cb7e4 100644 --- a/api/s23_options_util.py +++ b/api/s23_options_util.py @@ -164,9 +164,9 @@ OPTION_V3_HEADLOSS_MODEL_HW = OPTION_HEADLOSS_HW OPTION_V3_HEADLOSS_MODEL_DW = OPTION_HEADLOSS_DW OPTION_V3_HEADLOSS_MODEL_CM = OPTION_HEADLOSS_CM -OPTION_V3_STEP_SIZING = 'FULL' -OPTION_V3_STEP_SIZING = 'RELAXATION' -OPTION_V3_STEP_SIZING = 'LINESEARCH' +OPTION_V3_STEP_SIZING_FULL = 'FULL' +OPTION_V3_STEP_SIZING_RELAXATION = 'RELAXATION' +OPTION_V3_STEP_SIZING_LINESEARCH = 'LINESEARCH' OPTION_V3_IF_UNBALANCED_STOP = OPTION_UNBALANCED_STOP OPTION_V3_IF_UNBALANCED_CONTINUE = OPTION_UNBALANCED_CONTINUE diff --git a/tjnetwork.py b/tjnetwork.py index a831227..b874c2d 100644 --- a/tjnetwork.py +++ b/tjnetwork.py @@ -118,9 +118,9 @@ OPTION_V3_HEADLOSS_MODEL_HW = api.OPTION_V3_HEADLOSS_MODEL_HW OPTION_V3_HEADLOSS_MODEL_DW = api.OPTION_V3_HEADLOSS_MODEL_DW OPTION_V3_HEADLOSS_MODEL_CM = api.OPTION_V3_HEADLOSS_MODEL_CM -OPTION_V3_STEP_SIZING = api.OPTION_V3_STEP_SIZING -OPTION_V3_STEP_SIZING = api.OPTION_V3_STEP_SIZING -OPTION_V3_STEP_SIZING = api.OPTION_V3_STEP_SIZING +OPTION_V3_STEP_SIZING_FULL = api.OPTION_V3_STEP_SIZING_FULL +OPTION_V3_STEP_SIZING_RELAXATION = api.OPTION_V3_STEP_SIZING_RELAXATION +OPTION_V3_STEP_SIZING_LINESEARCH = api.OPTION_V3_STEP_SIZING_LINESEARCH OPTION_V3_IF_UNBALANCED_STOP = api.OPTION_V3_IF_UNBALANCED_STOP OPTION_V3_IF_UNBALANCED_CONTINUE = api.OPTION_V3_IF_UNBALANCED_CONTINUE From 402451eb71416182ef1ff9a6ac9c0bdfc918327e Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 9 Mar 2023 00:01:21 +0800 Subject: [PATCH 39/42] Keep default same for option v2 & v3 --- script/sql/create/23.options.sql | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/script/sql/create/23.options.sql b/script/sql/create/23.options.sql index 38a37a3..06a15f1 100644 --- a/script/sql/create/23.options.sql +++ b/script/sql/create/23.options.sql @@ -23,9 +23,9 @@ insert into options (key, value) values , ('SPECIFIC GRAVITY', '1.0') , ('TRIALS', '40') , ('ACCURACY', '0.001') -, ('HEADERROR', '0') -, ('FLOWCHANGE', '0') -, ('MINIMUM PRESSURE', '0') +, ('HEADERROR', '0.0') +, ('FLOWCHANGE', '0.0') +, ('MINIMUM PRESSURE', '0.0') , ('REQUIRED PRESSURE', '0.1') , ('PRESSURE EXPONENT', '0.5') , ('TOLERANCE', '0.01') @@ -50,11 +50,11 @@ insert into options_v3 (key, value) values , ('HEADLOSS_MODEL', 'H-W') , ('SPECIFIC_GRAVITY', '1.0') , ('SPECIFIC_VISCOSITY', '1.0') -, ('MAXIMUM_TRIALS', '100') -, ('HEAD_TOLERANCE', '0.0') -, ('FLOW_TOLERANCE', '0.0') +, ('MAXIMUM_TRIALS', '40') +, ('HEAD_TOLERANCE', '0.0005') +, ('FLOW_TOLERANCE', '0.0001') , ('FLOW_CHANGE_LIMIT', '0.0') -, ('RELATIVE_ACCURACY', '0.0') +, ('RELATIVE_ACCURACY', '0.001') , ('TIME_WEIGHT', '0.0') , ('STEP_SIZING', 'FULL') , ('IF_UNBALANCED', 'STOP') @@ -62,14 +62,14 @@ insert into options_v3 (key, value) values , ('DEMAND_PATTERN', '1') , ('DEMAND_MULTIPLIER', '1.0') , ('MINIMUM_PRESSURE', '0.0') -, ('SERVICE_PRESSURE', '0.0') +, ('SERVICE_PRESSURE', '0.1') , ('PRESSURE_EXPONENT', '0.5') , ('LEAKAGE_MODEL', 'NONE') , ('LEAKAGE_COEFF1', '0.0') , ('LEAKAGE_COEFF2', '0.0') , ('EMITTER_EXPONENT', '0.5') , ('QUALITY_MODEL', 'NONE') -, ('QUALITY_NAME', 'Chemical') +, ('QUALITY_NAME', 'CHEMICAL') , ('QUALITY_UNITS', 'MG/L') , ('TRACE_NODE', '') , ('SPECIFIC_DIFFUSIVITY', '1.0') From 0e1522f8e65742ccd687533e0d3410228786a134 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 9 Mar 2023 00:01:48 +0800 Subject: [PATCH 40/42] Fix demand model converter --- api/s23_options_util.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/api/s23_options_util.py b/api/s23_options_util.py index 79cb7e4..5a7a4be 100644 --- a/api/s23_options_util.py +++ b/api/s23_options_util.py @@ -390,7 +390,10 @@ def generate_v3(cs: ChangeSet) -> ChangeSet: if tokens[0].upper() == OPTION_QUALITY_TRACE and len(tokens) >= 2: cs_v3 |= { 'TRACE_NODE' : tokens[1] } elif key == 'DEMAND MODEL': - cs_v3 |= { map[key] : OPTION_V3_DEMAND_MODEL_POWER } + if op[key] == OPTION_DEMAND_MODEL_DDA: + cs_v3 |= { map[key] : OPTION_V3_DEMAND_MODEL_FIXED } + else: + cs_v3 |= { map[key] : OPTION_V3_DEMAND_MODEL_POWER } if len(cs_v3) > 0: cs_v3 |= g_update_prefix | { 'type' : 'option_v3' } From e06506d5dd98b7a6fcc25d8a853849b560475374 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 9 Mar 2023 00:03:07 +0800 Subject: [PATCH 41/42] Update test_option case --- test_tjnetwork.py | 249 ++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 220 insertions(+), 29 deletions(-) diff --git a/test_tjnetwork.py b/test_tjnetwork.py index 4bdb2c4..42a5900 100644 --- a/test_tjnetwork.py +++ b/test_tjnetwork.py @@ -3230,62 +3230,253 @@ class TestApi: o = get_option(p) assert o['UNITS'] == OPTION_UNITS_GPM + assert o['PRESSURE'] == OPTION_PRESSURE_PSI assert o['HEADLOSS'] == OPTION_HEADLOSS_HW + assert o['QUALITY'] == OPTION_QUALITY_NONE + assert o['UNBALANCED'] == OPTION_UNBALANCED_STOP + assert o['PATTERN'] == '1' + assert o['DEMAND MODEL'] == OPTION_DEMAND_MODEL_DDA + assert o['DEMAND MULTIPLIER'] == '1.0' + assert o['EMITTER EXPONENT'] == '0.5' assert o['VISCOSITY'] == '1.0' + assert o['DIFFUSIVITY'] == '1.0' assert o['SPECIFIC GRAVITY'] == '1.0' assert o['TRIALS'] == '40' assert o['ACCURACY'] == '0.001' - assert o['FLOWCHANGE'] == '0' - assert o['HEADERROR'] == '0' - assert o['CHECKFREQ'] == '2' - assert o['MAXCHECK'] == '10' - assert o['DAMPLIMIT'] == '0' - assert o['UNBALANCED'] == OPTION_UNBALANCED_STOP - assert o['DEMAND MODEL'] == OPTION_DEMAND_MODEL_DDA - assert o['MINIMUM PRESSURE'] == '0' + assert o['HEADERROR'] == '0.0' + assert o['FLOWCHANGE'] == '0.0' + assert o['MINIMUM PRESSURE'] == '0.0' assert o['REQUIRED PRESSURE'] == '0.1' assert o['PRESSURE EXPONENT'] == '0.5' - assert o['PATTERN'] == '1' - assert o['DEMAND MULTIPLIER'] == '1.0' - assert o['EMITTER EXPONENT'] == '0.5' - assert o['QUALITY'] == OPTION_QUALITY_NONE - assert o['DIFFUSIVITY'] == '1.0' assert o['TOLERANCE'] == '0.01' - assert o['PRESSURE'] == OPTION_PRESSURE_PSI assert o['HTOL'] == '0.0005' assert o['QTOL'] == '0.0001' assert o['RQTOL'] == '0.0000001' + assert o['CHECKFREQ'] == '2' + assert o['MAXCHECK'] == '10' + assert o['DAMPLIMIT'] == '0' + + o3 = get_option_v3(p) + assert o3['FLOW_UNITS'] == OPTION_V3_FLOW_UNITS_GPM + assert o3['PRESSURE_UNITS'] == OPTION_V3_PRESSURE_UNITS_PSI + assert o3['HEADLOSS_MODEL'] == OPTION_V3_HEADLOSS_MODEL_HW + assert o3['SPECIFIC_GRAVITY'] == '1.0' + assert o3['SPECIFIC_VISCOSITY'] == '1.0' + assert o3['MAXIMUM_TRIALS'] == '40' + assert o3['HEAD_TOLERANCE'] == '0.0005' + assert o3['FLOW_TOLERANCE'] == '0.0001' + assert o3['FLOW_CHANGE_LIMIT'] == '0.0' + assert o3['RELATIVE_ACCURACY'] == '0.001' + assert o3['TIME_WEIGHT'] == '0.0' + assert o3['STEP_SIZING'] == OPTION_V3_STEP_SIZING_FULL + assert o3['IF_UNBALANCED'] == OPTION_V3_IF_UNBALANCED_STOP + assert o3['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_FIXED + assert o3['DEMAND_PATTERN'] == '1' + assert o3['DEMAND_MULTIPLIER'] == '1.0' + assert o3['MINIMUM_PRESSURE'] == '0.0' + assert o3['SERVICE_PRESSURE'] == '0.1' + assert o3['PRESSURE_EXPONENT'] == '0.5' + assert o3['LEAKAGE_MODEL'] == OPTION_V3_LEAKAGE_MODEL_NONE + assert o3['LEAKAGE_COEFF1'] == '0.0' + assert o3['LEAKAGE_COEFF2'] == '0.0' + assert o3['EMITTER_EXPONENT'] == '0.5' + assert o3['QUALITY_MODEL'] == OPTION_V3_QUALITY_MODEL_NONE + assert o3['QUALITY_NAME'] == OPTION_V3_QUALITY_MODEL_CHEMICAL + assert o3['QUALITY_UNITS'] == OPTION_V3_QUALITY_UNITS_MGL + assert o3['TRACE_NODE'] == '' + assert o3['SPECIFIC_DIFFUSIVITY'] == '1.0' + assert o3['QUALITY_TOLERANCE'] == '0.01' o['UNITS'] = OPTION_UNITS_LPS + o['PRESSURE'] = OPTION_PRESSURE_KPA + o['HEADLOSS'] = OPTION_HEADLOSS_DW + o['QUALITY'] = f'{OPTION_QUALITY_TRACE} 1' + o['UNBALANCED'] = OPTION_UNBALANCED_CONTINUE + o['PATTERN'] = '2' + o['DEMAND MODEL'] = OPTION_DEMAND_MODEL_PDA + o['DEMAND MULTIPLIER'] = '2.0' + o['EMITTER EXPONENT'] = '1.5' + o['VISCOSITY'] = '2.0' + o['DIFFUSIVITY'] = '2.0' + o['SPECIFIC GRAVITY'] = '2.0' + o['TRIALS'] = '50' + o['ACCURACY'] = '0.0001' + o['HEADERROR'] = '0.01' + o['FLOWCHANGE'] = '0.01' + o['MINIMUM PRESSURE'] = '0.01' + o['REQUIRED PRESSURE'] = '0.01' + o['PRESSURE EXPONENT'] = '0.05' + o['TOLERANCE'] = '0.001' + o['HTOL'] = '0.005' + o['QTOL'] = '0.001' + o['RQTOL'] = '0.000001' + o['CHECKFREQ'] = '1' + o['MAXCHECK'] = '15' + o['DAMPLIMIT'] = '1' + set_option(p, ChangeSet(o)) o = get_option(p) assert o['UNITS'] == OPTION_UNITS_LPS + assert o['PRESSURE'] == OPTION_PRESSURE_KPA + assert o['HEADLOSS'] == OPTION_HEADLOSS_DW + assert o['QUALITY'] == f'{OPTION_QUALITY_TRACE} 1' + assert o['UNBALANCED'] == OPTION_UNBALANCED_CONTINUE + assert o['PATTERN'] == '2' + assert o['DEMAND MODEL'] == OPTION_DEMAND_MODEL_PDA + assert o['DEMAND MULTIPLIER'] == '2.0' + assert o['EMITTER EXPONENT'] == '1.5' + assert o['VISCOSITY'] == '2.0' + assert o['DIFFUSIVITY'] == '2.0' + assert o['SPECIFIC GRAVITY'] == '2.0' + assert o['TRIALS'] == '50' + assert o['ACCURACY'] == '0.0001' + assert o['HEADERROR'] == '0.01' + assert o['FLOWCHANGE'] == '0.01' + assert o['MINIMUM PRESSURE'] == '0.01' + assert o['REQUIRED PRESSURE'] == '0.01' + assert o['PRESSURE EXPONENT'] == '0.05' + assert o['TOLERANCE'] == '0.001' + assert o['HTOL'] == '0.005' + assert o['QTOL'] == '0.001' + assert o['RQTOL'] == '0.000001' + assert o['CHECKFREQ'] == '1' + assert o['MAXCHECK'] == '15' + assert o['DAMPLIMIT'] == '1' + + o3 = get_option_v3(p) + assert o3['FLOW_UNITS'] == OPTION_V3_FLOW_UNITS_LPS + assert o3['PRESSURE_UNITS'] == OPTION_V3_PRESSURE_UNITS_KPA + assert o3['HEADLOSS_MODEL'] == OPTION_V3_HEADLOSS_MODEL_DW + assert o3['SPECIFIC_GRAVITY'] == '2.0' + assert o3['SPECIFIC_VISCOSITY'] == '2.0' + assert o3['MAXIMUM_TRIALS'] == '50' + assert o3['HEAD_TOLERANCE'] == '0.005' + assert o3['FLOW_TOLERANCE'] == '0.001' + assert o3['FLOW_CHANGE_LIMIT'] == '0.01' + assert o3['RELATIVE_ACCURACY'] == '0.0001' + assert o3['TIME_WEIGHT'] == '0.0' + assert o3['STEP_SIZING'] == OPTION_V3_STEP_SIZING_FULL + assert o3['IF_UNBALANCED'] == OPTION_V3_IF_UNBALANCED_CONTINUE + assert o3['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_POWER + assert o3['DEMAND_PATTERN'] == '2' + assert o3['DEMAND_MULTIPLIER'] == '2.0' + assert o3['MINIMUM_PRESSURE'] == '0.01' + assert o3['SERVICE_PRESSURE'] == '0.01' + assert o3['PRESSURE_EXPONENT'] == '0.05' + assert o3['LEAKAGE_MODEL'] == OPTION_V3_LEAKAGE_MODEL_NONE + assert o3['LEAKAGE_COEFF1'] == '0.0' + assert o3['LEAKAGE_COEFF2'] == '0.0' + assert o3['EMITTER_EXPONENT'] == '1.5' + assert o3['QUALITY_MODEL'] == OPTION_V3_QUALITY_MODEL_TRACE + assert o3['QUALITY_NAME'] == OPTION_V3_QUALITY_MODEL_CHEMICAL + assert o3['QUALITY_UNITS'] == OPTION_V3_QUALITY_UNITS_MGL + assert o3['TRACE_NODE'] == '1' + assert o3['SPECIFIC_DIFFUSIVITY'] == '2.0' + assert o3['QUALITY_TOLERANCE'] == '0.001' + + o3['FLOW_UNITS'] = OPTION_V3_FLOW_UNITS_GPM + o3['PRESSURE_UNITS'] = OPTION_V3_PRESSURE_UNITS_PSI + o3['HEADLOSS_MODEL'] = OPTION_V3_HEADLOSS_MODEL_HW + o3['SPECIFIC_GRAVITY'] = '1.0' + o3['SPECIFIC_VISCOSITY'] = '1.0' + o3['MAXIMUM_TRIALS'] = '40' + o3['HEAD_TOLERANCE'] = '0.0005' + o3['FLOW_TOLERANCE'] = '0.0001' + o3['FLOW_CHANGE_LIMIT'] = '0.0' + o3['RELATIVE_ACCURACY'] = '0.001' + o3['TIME_WEIGHT'] = '0.0' + o3['STEP_SIZING'] = OPTION_V3_STEP_SIZING_RELAXATION + o3['IF_UNBALANCED'] = OPTION_V3_IF_UNBALANCED_STOP + o3['DEMAND_MODEL'] = OPTION_V3_DEMAND_MODEL_FIXED + o3['DEMAND_PATTERN'] = '1' + o3['DEMAND_MULTIPLIER'] = '1.0' + o3['MINIMUM_PRESSURE'] = '0.0' + o3['SERVICE_PRESSURE'] = '0.1' + o3['PRESSURE_EXPONENT'] = '0.5' + o3['LEAKAGE_MODEL'] = OPTION_V3_LEAKAGE_MODEL_POWER + o3['LEAKAGE_COEFF1'] = '1.0' + o3['LEAKAGE_COEFF2'] = '2.0' + o3['EMITTER_EXPONENT'] = '0.5' + o3['QUALITY_MODEL'] = OPTION_V3_QUALITY_MODEL_TRACE + o3['QUALITY_NAME'] = OPTION_V3_QUALITY_MODEL_NONE + o3['QUALITY_UNITS'] = OPTION_V3_QUALITY_UNITS_HRS + o3['TRACE_NODE'] = '2' + o3['SPECIFIC_DIFFUSIVITY'] = '1.0' + o3['QUALITY_TOLERANCE'] = '0.01' + + set_option_v3(p, ChangeSet(o3)) + + o3 = get_option_v3(p) + assert o3['FLOW_UNITS'] == OPTION_V3_FLOW_UNITS_GPM + assert o3['PRESSURE_UNITS'] == OPTION_V3_PRESSURE_UNITS_PSI + assert o3['HEADLOSS_MODEL'] == OPTION_V3_HEADLOSS_MODEL_HW + assert o3['SPECIFIC_GRAVITY'] == '1.0' + assert o3['SPECIFIC_VISCOSITY'] == '1.0' + assert o3['MAXIMUM_TRIALS'] == '40' + assert o3['HEAD_TOLERANCE'] == '0.0005' + assert o3['FLOW_TOLERANCE'] == '0.0001' + assert o3['FLOW_CHANGE_LIMIT'] == '0.0' + assert o3['RELATIVE_ACCURACY'] == '0.001' + assert o3['TIME_WEIGHT'] == '0.0' + assert o3['STEP_SIZING'] == OPTION_V3_STEP_SIZING_RELAXATION + assert o3['IF_UNBALANCED'] == OPTION_V3_IF_UNBALANCED_STOP + assert o3['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_FIXED + assert o3['DEMAND_PATTERN'] == '1' + assert o3['DEMAND_MULTIPLIER'] == '1.0' + assert o3['MINIMUM_PRESSURE'] == '0.0' + assert o3['SERVICE_PRESSURE'] == '0.1' + assert o3['PRESSURE_EXPONENT'] == '0.5' + assert o3['LEAKAGE_MODEL'] == OPTION_V3_LEAKAGE_MODEL_POWER + assert o3['LEAKAGE_COEFF1'] == '1.0' + assert o3['LEAKAGE_COEFF2'] == '2.0' + assert o3['EMITTER_EXPONENT'] == '0.5' + assert o3['QUALITY_MODEL'] == OPTION_V3_QUALITY_MODEL_TRACE + assert o3['QUALITY_NAME'] == OPTION_V3_QUALITY_MODEL_NONE + assert o3['QUALITY_UNITS'] == OPTION_V3_QUALITY_UNITS_HRS + assert o3['TRACE_NODE'] == '2' + assert o3['SPECIFIC_DIFFUSIVITY'] == '1.0' + assert o3['QUALITY_TOLERANCE'] == '0.01' + + o = get_option(p) + assert o['UNITS'] == OPTION_UNITS_GPM + assert o['PRESSURE'] == OPTION_PRESSURE_PSI assert o['HEADLOSS'] == OPTION_HEADLOSS_HW + assert o['QUALITY'] == f'{OPTION_QUALITY_TRACE} 2' + assert o['UNBALANCED'] == OPTION_UNBALANCED_STOP + assert o['PATTERN'] == '1' + assert o['DEMAND MODEL'] == OPTION_DEMAND_MODEL_DDA + assert o['DEMAND MULTIPLIER'] == '1.0' + assert o['EMITTER EXPONENT'] == '0.5' assert o['VISCOSITY'] == '1.0' + assert o['DIFFUSIVITY'] == '1.0' assert o['SPECIFIC GRAVITY'] == '1.0' assert o['TRIALS'] == '40' assert o['ACCURACY'] == '0.001' - assert o['FLOWCHANGE'] == '0' - assert o['HEADERROR'] == '0' - assert o['CHECKFREQ'] == '2' - assert o['MAXCHECK'] == '10' - assert o['DAMPLIMIT'] == '0' - assert o['UNBALANCED'] == OPTION_UNBALANCED_STOP - assert o['DEMAND MODEL'] == OPTION_DEMAND_MODEL_DDA - assert o['MINIMUM PRESSURE'] == '0' + assert o['HEADERROR'] == '0.01' + assert o['FLOWCHANGE'] == '0.0' + assert o['MINIMUM PRESSURE'] == '0.0' assert o['REQUIRED PRESSURE'] == '0.1' assert o['PRESSURE EXPONENT'] == '0.5' - assert o['PATTERN'] == '1' - assert o['DEMAND MULTIPLIER'] == '1.0' - assert o['EMITTER EXPONENT'] == '0.5' - assert o['QUALITY'] == OPTION_QUALITY_NONE - assert o['DIFFUSIVITY'] == '1.0' assert o['TOLERANCE'] == '0.01' - assert o['PRESSURE'] == OPTION_PRESSURE_PSI assert o['HTOL'] == '0.0005' assert o['QTOL'] == '0.0001' - assert o['RQTOL'] == '0.0000001' + assert o['RQTOL'] == '0.000001' + assert o['CHECKFREQ'] == '1' + assert o['MAXCHECK'] == '15' + assert o['DAMPLIMIT'] == '1' + + o3['DEMAND_MODEL'] = OPTION_V3_DEMAND_MODEL_CONSTRAINED + set_option_v3(p, ChangeSet(o3)) + assert o3['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_CONSTRAINED + o = get_option(p) + assert o['DEMAND MODEL'] == OPTION_DEMAND_MODEL_PDA + + o3['DEMAND_MODEL'] = OPTION_V3_DEMAND_MODEL_LOGISTIC + set_option_v3(p, ChangeSet(o3)) + assert o3['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_LOGISTIC + o = get_option(p) + assert o['DEMAND MODEL'] == OPTION_DEMAND_MODEL_PDA self.leave(p) From 41f797878825e60829ac1a8d17d50e5ebb4c77f6 Mon Sep 17 00:00:00 2001 From: "WQY\\qiong" Date: Thu, 9 Mar 2023 00:28:28 +0800 Subject: [PATCH 42/42] Update test_option_op case --- test_tjnetwork.py | 515 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 437 insertions(+), 78 deletions(-) diff --git a/test_tjnetwork.py b/test_tjnetwork.py index 42a5900..63dc91f 100644 --- a/test_tjnetwork.py +++ b/test_tjnetwork.py @@ -3487,122 +3487,481 @@ class TestApi: o = get_option(p) assert o['UNITS'] == OPTION_UNITS_GPM + assert o['PRESSURE'] == OPTION_PRESSURE_PSI assert o['HEADLOSS'] == OPTION_HEADLOSS_HW + assert o['QUALITY'] == OPTION_QUALITY_NONE + assert o['UNBALANCED'] == OPTION_UNBALANCED_STOP + assert o['PATTERN'] == '1' + assert o['DEMAND MODEL'] == OPTION_DEMAND_MODEL_DDA + assert o['DEMAND MULTIPLIER'] == '1.0' + assert o['EMITTER EXPONENT'] == '0.5' assert o['VISCOSITY'] == '1.0' + assert o['DIFFUSIVITY'] == '1.0' assert o['SPECIFIC GRAVITY'] == '1.0' assert o['TRIALS'] == '40' assert o['ACCURACY'] == '0.001' - assert o['FLOWCHANGE'] == '0' - assert o['HEADERROR'] == '0' - assert o['CHECKFREQ'] == '2' - assert o['MAXCHECK'] == '10' - assert o['DAMPLIMIT'] == '0' - assert o['UNBALANCED'] == OPTION_UNBALANCED_STOP - assert o['DEMAND MODEL'] == OPTION_DEMAND_MODEL_DDA - assert o['MINIMUM PRESSURE'] == '0' + assert o['HEADERROR'] == '0.0' + assert o['FLOWCHANGE'] == '0.0' + assert o['MINIMUM PRESSURE'] == '0.0' assert o['REQUIRED PRESSURE'] == '0.1' assert o['PRESSURE EXPONENT'] == '0.5' - assert o['PATTERN'] == '1' - assert o['DEMAND MULTIPLIER'] == '1.0' - assert o['EMITTER EXPONENT'] == '0.5' - assert o['QUALITY'] == OPTION_QUALITY_NONE - assert o['DIFFUSIVITY'] == '1.0' assert o['TOLERANCE'] == '0.01' - assert o['PRESSURE'] == OPTION_PRESSURE_PSI assert o['HTOL'] == '0.0005' assert o['QTOL'] == '0.0001' assert o['RQTOL'] == '0.0000001' + assert o['CHECKFREQ'] == '2' + assert o['MAXCHECK'] == '10' + assert o['DAMPLIMIT'] == '0' + + o3 = get_option_v3(p) + assert o3['FLOW_UNITS'] == OPTION_V3_FLOW_UNITS_GPM + assert o3['PRESSURE_UNITS'] == OPTION_V3_PRESSURE_UNITS_PSI + assert o3['HEADLOSS_MODEL'] == OPTION_V3_HEADLOSS_MODEL_HW + assert o3['SPECIFIC_GRAVITY'] == '1.0' + assert o3['SPECIFIC_VISCOSITY'] == '1.0' + assert o3['MAXIMUM_TRIALS'] == '40' + assert o3['HEAD_TOLERANCE'] == '0.0005' + assert o3['FLOW_TOLERANCE'] == '0.0001' + assert o3['FLOW_CHANGE_LIMIT'] == '0.0' + assert o3['RELATIVE_ACCURACY'] == '0.001' + assert o3['TIME_WEIGHT'] == '0.0' + assert o3['STEP_SIZING'] == OPTION_V3_STEP_SIZING_FULL + assert o3['IF_UNBALANCED'] == OPTION_V3_IF_UNBALANCED_STOP + assert o3['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_FIXED + assert o3['DEMAND_PATTERN'] == '1' + assert o3['DEMAND_MULTIPLIER'] == '1.0' + assert o3['MINIMUM_PRESSURE'] == '0.0' + assert o3['SERVICE_PRESSURE'] == '0.1' + assert o3['PRESSURE_EXPONENT'] == '0.5' + assert o3['LEAKAGE_MODEL'] == OPTION_V3_LEAKAGE_MODEL_NONE + assert o3['LEAKAGE_COEFF1'] == '0.0' + assert o3['LEAKAGE_COEFF2'] == '0.0' + assert o3['EMITTER_EXPONENT'] == '0.5' + assert o3['QUALITY_MODEL'] == OPTION_V3_QUALITY_MODEL_NONE + assert o3['QUALITY_NAME'] == OPTION_V3_QUALITY_MODEL_CHEMICAL + assert o3['QUALITY_UNITS'] == OPTION_V3_QUALITY_UNITS_MGL + assert o3['TRACE_NODE'] == '' + assert o3['SPECIFIC_DIFFUSIVITY'] == '1.0' + assert o3['QUALITY_TOLERANCE'] == '0.01' o['UNITS'] = OPTION_UNITS_LPS - cs = set_option(p, ChangeSet(o)).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'option' - assert cs['UNITS'] == OPTION_UNITS_LPS - assert cs['HEADLOSS'] == OPTION_HEADLOSS_HW - assert cs['VISCOSITY'] == '1.0' - assert cs['SPECIFIC GRAVITY'] == '1.0' - assert cs['TRIALS'] == '40' - assert cs['ACCURACY'] == '0.001' - assert cs['FLOWCHANGE'] == '0' - assert cs['HEADERROR'] == '0' - assert cs['CHECKFREQ'] == '2' - assert cs['MAXCHECK'] == '10' - assert cs['DAMPLIMIT'] == '0' - assert cs['UNBALANCED'] == OPTION_UNBALANCED_STOP - assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_DDA - assert cs['MINIMUM PRESSURE'] == '0' - assert cs['REQUIRED PRESSURE'] == '0.1' - assert cs['PRESSURE EXPONENT'] == '0.5' - assert cs['PATTERN'] == '1' - assert cs['DEMAND MULTIPLIER'] == '1.0' - assert cs['EMITTER EXPONENT'] == '0.5' - assert cs['QUALITY'] == OPTION_QUALITY_NONE - assert cs['DIFFUSIVITY'] == '1.0' - assert cs['TOLERANCE'] == '0.01' - assert cs['PRESSURE'] == OPTION_PRESSURE_PSI - assert cs['HTOL'] == '0.0005' - assert cs['QTOL'] == '0.0001' - assert cs['RQTOL'] == '0.0000001' + o['PRESSURE'] = OPTION_PRESSURE_KPA + o['HEADLOSS'] = OPTION_HEADLOSS_DW + o['QUALITY'] = f'{OPTION_QUALITY_TRACE} 1' + o['UNBALANCED'] = OPTION_UNBALANCED_CONTINUE + o['PATTERN'] = '2' + o['DEMAND MODEL'] = OPTION_DEMAND_MODEL_PDA + o['DEMAND MULTIPLIER'] = '2.0' + o['EMITTER EXPONENT'] = '1.5' + o['VISCOSITY'] = '2.0' + o['DIFFUSIVITY'] = '2.0' + o['SPECIFIC GRAVITY'] = '2.0' + o['TRIALS'] = '50' + o['ACCURACY'] = '0.0001' + o['HEADERROR'] = '0.01' + o['FLOWCHANGE'] = '0.01' + o['MINIMUM PRESSURE'] = '0.01' + o['REQUIRED PRESSURE'] = '0.01' + o['PRESSURE EXPONENT'] = '0.05' + o['TOLERANCE'] = '0.001' + o['HTOL'] = '0.005' + o['QTOL'] = '0.001' + o['RQTOL'] = '0.000001' + o['CHECKFREQ'] = '1' + o['MAXCHECK'] = '15' + o['DAMPLIMIT'] = '1' - cs = execute_undo(p).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'option' + css = set_option(p, ChangeSet(o)).operations + cs = css[0] + assert cs['UNITS'] == OPTION_UNITS_LPS + assert cs['PRESSURE'] == OPTION_PRESSURE_KPA + assert cs['HEADLOSS'] == OPTION_HEADLOSS_DW + assert cs['QUALITY'] == f'{OPTION_QUALITY_TRACE} 1' + assert cs['UNBALANCED'] == OPTION_UNBALANCED_CONTINUE + assert cs['PATTERN'] == '2' + assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_PDA + assert cs['DEMAND MULTIPLIER'] == '2.0' + assert cs['EMITTER EXPONENT'] == '1.5' + assert cs['VISCOSITY'] == '2.0' + assert cs['DIFFUSIVITY'] == '2.0' + assert cs['SPECIFIC GRAVITY'] == '2.0' + assert cs['TRIALS'] == '50' + assert cs['ACCURACY'] == '0.0001' + assert cs['HEADERROR'] == '0.01' + assert cs['FLOWCHANGE'] == '0.01' + assert cs['MINIMUM PRESSURE'] == '0.01' + assert cs['REQUIRED PRESSURE'] == '0.01' + assert cs['PRESSURE EXPONENT'] == '0.05' + assert cs['TOLERANCE'] == '0.001' + assert cs['HTOL'] == '0.005' + assert cs['QTOL'] == '0.001' + assert cs['RQTOL'] == '0.000001' + assert cs['CHECKFREQ'] == '1' + assert cs['MAXCHECK'] == '15' + assert cs['DAMPLIMIT'] == '1' + cs = css[1] + assert cs['FLOW_UNITS'] == OPTION_V3_FLOW_UNITS_LPS + assert cs['PRESSURE_UNITS'] == OPTION_V3_PRESSURE_UNITS_KPA + assert cs['HEADLOSS_MODEL'] == OPTION_V3_HEADLOSS_MODEL_DW + assert cs['SPECIFIC_GRAVITY'] == '2.0' + assert cs['SPECIFIC_VISCOSITY'] == '2.0' + assert cs['MAXIMUM_TRIALS'] == '50' + assert cs['HEAD_TOLERANCE'] == '0.005' + assert cs['FLOW_TOLERANCE'] == '0.001' + assert cs['FLOW_CHANGE_LIMIT'] == '0.01' + assert cs['RELATIVE_ACCURACY'] == '0.0001' + assert cs['IF_UNBALANCED'] == OPTION_V3_IF_UNBALANCED_CONTINUE + assert cs['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_POWER + assert cs['DEMAND_PATTERN'] == '2' + assert cs['DEMAND_MULTIPLIER'] == '2.0' + assert cs['MINIMUM_PRESSURE'] == '0.01' + assert cs['SERVICE_PRESSURE'] == '0.01' + assert cs['PRESSURE_EXPONENT'] == '0.05' + assert cs['EMITTER_EXPONENT'] == '1.5' + assert cs['QUALITY_MODEL'] == OPTION_V3_QUALITY_MODEL_TRACE + assert cs['TRACE_NODE'] == '1' + assert cs['SPECIFIC_DIFFUSIVITY'] == '2.0' + assert cs['QUALITY_TOLERANCE'] == '0.001' + + css = execute_undo(p).operations + cs = css[0] + assert cs['FLOW_UNITS'] == OPTION_V3_FLOW_UNITS_GPM + assert cs['PRESSURE_UNITS'] == OPTION_V3_PRESSURE_UNITS_PSI + assert cs['HEADLOSS_MODEL'] == OPTION_V3_HEADLOSS_MODEL_HW + assert cs['SPECIFIC_GRAVITY'] == '1.0' + assert cs['SPECIFIC_VISCOSITY'] == '1.0' + assert cs['MAXIMUM_TRIALS'] == '40' + assert cs['HEAD_TOLERANCE'] == '0.0005' + assert cs['FLOW_TOLERANCE'] == '0.0001' + assert cs['FLOW_CHANGE_LIMIT'] == '0.0' + assert cs['RELATIVE_ACCURACY'] == '0.001' + assert cs['IF_UNBALANCED'] == OPTION_V3_IF_UNBALANCED_STOP + assert cs['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_FIXED + assert cs['DEMAND_PATTERN'] == '1' + assert cs['DEMAND_MULTIPLIER'] == '1.0' + assert cs['MINIMUM_PRESSURE'] == '0.0' + assert cs['SERVICE_PRESSURE'] == '0.1' + assert cs['PRESSURE_EXPONENT'] == '0.5' + assert cs['EMITTER_EXPONENT'] == '0.5' + assert cs['QUALITY_MODEL'] == OPTION_V3_QUALITY_MODEL_NONE + assert cs['TRACE_NODE'] == '' + assert cs['SPECIFIC_DIFFUSIVITY'] == '1.0' + assert cs['QUALITY_TOLERANCE'] == '0.01' + cs = css[1] assert cs['UNITS'] == OPTION_UNITS_GPM + assert cs['PRESSURE'] == OPTION_PRESSURE_PSI assert cs['HEADLOSS'] == OPTION_HEADLOSS_HW + assert cs['QUALITY'] == OPTION_QUALITY_NONE + assert cs['UNBALANCED'] == OPTION_UNBALANCED_STOP + assert cs['PATTERN'] == '1' + assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_DDA + assert cs['DEMAND MULTIPLIER'] == '1.0' + assert cs['EMITTER EXPONENT'] == '0.5' assert cs['VISCOSITY'] == '1.0' + assert cs['DIFFUSIVITY'] == '1.0' assert cs['SPECIFIC GRAVITY'] == '1.0' assert cs['TRIALS'] == '40' assert cs['ACCURACY'] == '0.001' - assert cs['FLOWCHANGE'] == '0' - assert cs['HEADERROR'] == '0' - assert cs['CHECKFREQ'] == '2' - assert cs['MAXCHECK'] == '10' - assert cs['DAMPLIMIT'] == '0' - assert cs['UNBALANCED'] == OPTION_UNBALANCED_STOP - assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_DDA - assert cs['MINIMUM PRESSURE'] == '0' + assert cs['HEADERROR'] == '0.0' + assert cs['FLOWCHANGE'] == '0.0' + assert cs['MINIMUM PRESSURE'] == '0.0' assert cs['REQUIRED PRESSURE'] == '0.1' assert cs['PRESSURE EXPONENT'] == '0.5' - assert cs['PATTERN'] == '1' - assert cs['DEMAND MULTIPLIER'] == '1.0' - assert cs['EMITTER EXPONENT'] == '0.5' - assert cs['QUALITY'] == OPTION_QUALITY_NONE - assert cs['DIFFUSIVITY'] == '1.0' assert cs['TOLERANCE'] == '0.01' - assert cs['PRESSURE'] == OPTION_PRESSURE_PSI assert cs['HTOL'] == '0.0005' assert cs['QTOL'] == '0.0001' assert cs['RQTOL'] == '0.0000001' + assert cs['CHECKFREQ'] == '2' + assert cs['MAXCHECK'] == '10' + assert cs['DAMPLIMIT'] == '0' - cs = execute_redo(p).operations[0] - assert cs['operation'] == API_UPDATE - assert cs['type'] == 'option' + css = execute_redo(p).operations + cs = css[0] assert cs['UNITS'] == OPTION_UNITS_LPS + assert cs['PRESSURE'] == OPTION_PRESSURE_KPA + assert cs['HEADLOSS'] == OPTION_HEADLOSS_DW + assert cs['QUALITY'] == f'{OPTION_QUALITY_TRACE} 1' + assert cs['UNBALANCED'] == OPTION_UNBALANCED_CONTINUE + assert cs['PATTERN'] == '2' + assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_PDA + assert cs['DEMAND MULTIPLIER'] == '2.0' + assert cs['EMITTER EXPONENT'] == '1.5' + assert cs['VISCOSITY'] == '2.0' + assert cs['DIFFUSIVITY'] == '2.0' + assert cs['SPECIFIC GRAVITY'] == '2.0' + assert cs['TRIALS'] == '50' + assert cs['ACCURACY'] == '0.0001' + assert cs['HEADERROR'] == '0.01' + assert cs['FLOWCHANGE'] == '0.01' + assert cs['MINIMUM PRESSURE'] == '0.01' + assert cs['REQUIRED PRESSURE'] == '0.01' + assert cs['PRESSURE EXPONENT'] == '0.05' + assert cs['TOLERANCE'] == '0.001' + assert cs['HTOL'] == '0.005' + assert cs['QTOL'] == '0.001' + assert cs['RQTOL'] == '0.000001' + assert cs['CHECKFREQ'] == '1' + assert cs['MAXCHECK'] == '15' + assert cs['DAMPLIMIT'] == '1' + cs = css[1] + assert cs['FLOW_UNITS'] == OPTION_V3_FLOW_UNITS_LPS + assert cs['PRESSURE_UNITS'] == OPTION_V3_PRESSURE_UNITS_KPA + assert cs['HEADLOSS_MODEL'] == OPTION_V3_HEADLOSS_MODEL_DW + assert cs['SPECIFIC_GRAVITY'] == '2.0' + assert cs['SPECIFIC_VISCOSITY'] == '2.0' + assert cs['MAXIMUM_TRIALS'] == '50' + assert cs['HEAD_TOLERANCE'] == '0.005' + assert cs['FLOW_TOLERANCE'] == '0.001' + assert cs['FLOW_CHANGE_LIMIT'] == '0.01' + assert cs['RELATIVE_ACCURACY'] == '0.0001' + assert cs['IF_UNBALANCED'] == OPTION_V3_IF_UNBALANCED_CONTINUE + assert cs['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_POWER + assert cs['DEMAND_PATTERN'] == '2' + assert cs['DEMAND_MULTIPLIER'] == '2.0' + assert cs['MINIMUM_PRESSURE'] == '0.01' + assert cs['SERVICE_PRESSURE'] == '0.01' + assert cs['PRESSURE_EXPONENT'] == '0.05' + assert cs['EMITTER_EXPONENT'] == '1.5' + assert cs['QUALITY_MODEL'] == OPTION_V3_QUALITY_MODEL_TRACE + assert cs['TRACE_NODE'] == '1' + assert cs['SPECIFIC_DIFFUSIVITY'] == '2.0' + assert cs['QUALITY_TOLERANCE'] == '0.001' + + o3['FLOW_UNITS'] = OPTION_V3_FLOW_UNITS_GPM + o3['PRESSURE_UNITS'] = OPTION_V3_PRESSURE_UNITS_PSI + o3['HEADLOSS_MODEL'] = OPTION_V3_HEADLOSS_MODEL_HW + o3['SPECIFIC_GRAVITY'] = '1.0' + o3['SPECIFIC_VISCOSITY'] = '1.0' + o3['MAXIMUM_TRIALS'] = '40' + o3['HEAD_TOLERANCE'] = '0.0005' + o3['FLOW_TOLERANCE'] = '0.0001' + o3['FLOW_CHANGE_LIMIT'] = '0.0' + o3['RELATIVE_ACCURACY'] = '0.001' + o3['TIME_WEIGHT'] = '0.0' + o3['STEP_SIZING'] = OPTION_V3_STEP_SIZING_RELAXATION + o3['IF_UNBALANCED'] = OPTION_V3_IF_UNBALANCED_STOP + o3['DEMAND_MODEL'] = OPTION_V3_DEMAND_MODEL_FIXED + o3['DEMAND_PATTERN'] = '1' + o3['DEMAND_MULTIPLIER'] = '1.0' + o3['MINIMUM_PRESSURE'] = '0.0' + o3['SERVICE_PRESSURE'] = '0.1' + o3['PRESSURE_EXPONENT'] = '0.5' + o3['LEAKAGE_MODEL'] = OPTION_V3_LEAKAGE_MODEL_POWER + o3['LEAKAGE_COEFF1'] = '1.0' + o3['LEAKAGE_COEFF2'] = '2.0' + o3['EMITTER_EXPONENT'] = '0.5' + o3['QUALITY_MODEL'] = OPTION_V3_QUALITY_MODEL_TRACE + o3['QUALITY_NAME'] = OPTION_V3_QUALITY_MODEL_NONE + o3['QUALITY_UNITS'] = OPTION_V3_QUALITY_UNITS_HRS + o3['TRACE_NODE'] = '2' + o3['SPECIFIC_DIFFUSIVITY'] = '1.0' + o3['QUALITY_TOLERANCE'] = '0.01' + + css = set_option_v3(p, ChangeSet(o3)).operations + cs = css[0] + assert cs['FLOW_UNITS'] == OPTION_V3_FLOW_UNITS_GPM + assert cs['PRESSURE_UNITS'] == OPTION_V3_PRESSURE_UNITS_PSI + assert cs['HEADLOSS_MODEL'] == OPTION_V3_HEADLOSS_MODEL_HW + assert cs['SPECIFIC_GRAVITY'] == '1.0' + assert cs['SPECIFIC_VISCOSITY'] == '1.0' + assert cs['MAXIMUM_TRIALS'] == '40' + assert cs['HEAD_TOLERANCE'] == '0.0005' + assert cs['FLOW_TOLERANCE'] == '0.0001' + assert cs['FLOW_CHANGE_LIMIT'] == '0.0' + assert cs['RELATIVE_ACCURACY'] == '0.001' + assert cs['TIME_WEIGHT'] == '0.0' + assert cs['STEP_SIZING'] == OPTION_V3_STEP_SIZING_RELAXATION + assert cs['IF_UNBALANCED'] == OPTION_V3_IF_UNBALANCED_STOP + assert cs['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_FIXED + assert cs['DEMAND_PATTERN'] == '1' + assert cs['DEMAND_MULTIPLIER'] == '1.0' + assert cs['MINIMUM_PRESSURE'] == '0.0' + assert cs['SERVICE_PRESSURE'] == '0.1' + assert cs['PRESSURE_EXPONENT'] == '0.5' + assert cs['LEAKAGE_MODEL'] == OPTION_V3_LEAKAGE_MODEL_POWER + assert cs['LEAKAGE_COEFF1'] == '1.0' + assert cs['LEAKAGE_COEFF2'] == '2.0' + assert cs['EMITTER_EXPONENT'] == '0.5' + assert cs['QUALITY_MODEL'] == OPTION_V3_QUALITY_MODEL_TRACE + assert cs['QUALITY_NAME'] == OPTION_V3_QUALITY_MODEL_NONE + assert cs['QUALITY_UNITS'] == OPTION_V3_QUALITY_UNITS_HRS + assert cs['TRACE_NODE'] == '2' + assert cs['SPECIFIC_DIFFUSIVITY'] == '1.0' + assert cs['QUALITY_TOLERANCE'] == '0.01' + cs = css[1] + assert cs['UNITS'] == OPTION_UNITS_GPM + assert cs['PRESSURE'] == OPTION_PRESSURE_PSI assert cs['HEADLOSS'] == OPTION_HEADLOSS_HW + assert cs['QUALITY'] == f'{OPTION_QUALITY_TRACE} 2' + assert cs['UNBALANCED'] == OPTION_UNBALANCED_STOP + assert cs['PATTERN'] == '1' + assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_DDA + assert cs['DEMAND MULTIPLIER'] == '1.0' + assert cs['EMITTER EXPONENT'] == '0.5' assert cs['VISCOSITY'] == '1.0' + assert cs['DIFFUSIVITY'] == '1.0' assert cs['SPECIFIC GRAVITY'] == '1.0' assert cs['TRIALS'] == '40' assert cs['ACCURACY'] == '0.001' - assert cs['FLOWCHANGE'] == '0' - assert cs['HEADERROR'] == '0' - assert cs['CHECKFREQ'] == '2' - assert cs['MAXCHECK'] == '10' - assert cs['DAMPLIMIT'] == '0' - assert cs['UNBALANCED'] == OPTION_UNBALANCED_STOP - assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_DDA - assert cs['MINIMUM PRESSURE'] == '0' + assert cs['FLOWCHANGE'] == '0.0' + assert cs['MINIMUM PRESSURE'] == '0.0' assert cs['REQUIRED PRESSURE'] == '0.1' assert cs['PRESSURE EXPONENT'] == '0.5' - assert cs['PATTERN'] == '1' - assert cs['DEMAND MULTIPLIER'] == '1.0' - assert cs['EMITTER EXPONENT'] == '0.5' - assert cs['QUALITY'] == OPTION_QUALITY_NONE - assert cs['DIFFUSIVITY'] == '1.0' assert cs['TOLERANCE'] == '0.01' - assert cs['PRESSURE'] == OPTION_PRESSURE_PSI assert cs['HTOL'] == '0.0005' assert cs['QTOL'] == '0.0001' - assert cs['RQTOL'] == '0.0000001' + + css = execute_undo(p).operations + cs = css[0] + assert cs['UNITS'] == OPTION_UNITS_LPS + assert cs['PRESSURE'] == OPTION_PRESSURE_KPA + assert cs['HEADLOSS'] == OPTION_HEADLOSS_DW + assert cs['QUALITY'] == f'{OPTION_QUALITY_TRACE} 1' + assert cs['UNBALANCED'] == OPTION_UNBALANCED_CONTINUE + assert cs['PATTERN'] == '2' + assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_PDA + assert cs['DEMAND MULTIPLIER'] == '2.0' + assert cs['EMITTER EXPONENT'] == '1.5' + assert cs['VISCOSITY'] == '2.0' + assert cs['DIFFUSIVITY'] == '2.0' + assert cs['SPECIFIC GRAVITY'] == '2.0' + assert cs['TRIALS'] == '50' + assert cs['ACCURACY'] == '0.0001' + assert cs['FLOWCHANGE'] == '0.01' + assert cs['MINIMUM PRESSURE'] == '0.01' + assert cs['REQUIRED PRESSURE'] == '0.01' + assert cs['PRESSURE EXPONENT'] == '0.05' + assert cs['TOLERANCE'] == '0.001' + assert cs['HTOL'] == '0.005' + assert cs['QTOL'] == '0.001' + cs = css[1] + o3['FLOW_UNITS'] = OPTION_V3_FLOW_UNITS_GPM + o3['PRESSURE_UNITS'] = OPTION_V3_PRESSURE_UNITS_PSI + o3['HEADLOSS_MODEL'] = OPTION_V3_HEADLOSS_MODEL_HW + o3['SPECIFIC_GRAVITY'] = '1.0' + o3['SPECIFIC_VISCOSITY'] = '1.0' + o3['MAXIMUM_TRIALS'] = '40' + o3['HEAD_TOLERANCE'] = '0.0005' + o3['FLOW_TOLERANCE'] = '0.0001' + o3['FLOW_CHANGE_LIMIT'] = '0.0' + o3['RELATIVE_ACCURACY'] = '0.001' + o3['TIME_WEIGHT'] = '0.0' + o3['STEP_SIZING'] = OPTION_V3_STEP_SIZING_RELAXATION + o3['IF_UNBALANCED'] = OPTION_V3_IF_UNBALANCED_STOP + o3['DEMAND_MODEL'] = OPTION_V3_DEMAND_MODEL_FIXED + o3['DEMAND_PATTERN'] = '1' + o3['DEMAND_MULTIPLIER'] = '1.0' + o3['MINIMUM_PRESSURE'] = '0.0' + o3['SERVICE_PRESSURE'] = '0.1' + o3['PRESSURE_EXPONENT'] = '0.5' + o3['LEAKAGE_MODEL'] = OPTION_V3_LEAKAGE_MODEL_POWER + o3['LEAKAGE_COEFF1'] = '1.0' + o3['LEAKAGE_COEFF2'] = '2.0' + o3['EMITTER_EXPONENT'] = '0.5' + o3['QUALITY_MODEL'] = OPTION_V3_QUALITY_MODEL_TRACE + o3['QUALITY_NAME'] = OPTION_V3_QUALITY_MODEL_NONE + o3['QUALITY_UNITS'] = OPTION_V3_QUALITY_UNITS_HRS + o3['TRACE_NODE'] = '2' + o3['SPECIFIC_DIFFUSIVITY'] = '1.0' + o3['QUALITY_TOLERANCE'] = '0.01' + + css = execute_redo(p).operations + cs = css[0] + assert cs['FLOW_UNITS'] == OPTION_V3_FLOW_UNITS_GPM + assert cs['PRESSURE_UNITS'] == OPTION_V3_PRESSURE_UNITS_PSI + assert cs['HEADLOSS_MODEL'] == OPTION_V3_HEADLOSS_MODEL_HW + assert cs['SPECIFIC_GRAVITY'] == '1.0' + assert cs['SPECIFIC_VISCOSITY'] == '1.0' + assert cs['MAXIMUM_TRIALS'] == '40' + assert cs['HEAD_TOLERANCE'] == '0.0005' + assert cs['FLOW_TOLERANCE'] == '0.0001' + assert cs['FLOW_CHANGE_LIMIT'] == '0.0' + assert cs['RELATIVE_ACCURACY'] == '0.001' + assert cs['TIME_WEIGHT'] == '0.0' + assert cs['STEP_SIZING'] == OPTION_V3_STEP_SIZING_RELAXATION + assert cs['IF_UNBALANCED'] == OPTION_V3_IF_UNBALANCED_STOP + assert cs['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_FIXED + assert cs['DEMAND_PATTERN'] == '1' + assert cs['DEMAND_MULTIPLIER'] == '1.0' + assert cs['MINIMUM_PRESSURE'] == '0.0' + assert cs['SERVICE_PRESSURE'] == '0.1' + assert cs['PRESSURE_EXPONENT'] == '0.5' + assert cs['LEAKAGE_MODEL'] == OPTION_V3_LEAKAGE_MODEL_POWER + assert cs['LEAKAGE_COEFF1'] == '1.0' + assert cs['LEAKAGE_COEFF2'] == '2.0' + assert cs['EMITTER_EXPONENT'] == '0.5' + assert cs['QUALITY_MODEL'] == OPTION_V3_QUALITY_MODEL_TRACE + assert cs['QUALITY_NAME'] == OPTION_V3_QUALITY_MODEL_NONE + assert cs['QUALITY_UNITS'] == OPTION_V3_QUALITY_UNITS_HRS + assert cs['TRACE_NODE'] == '2' + assert cs['SPECIFIC_DIFFUSIVITY'] == '1.0' + assert cs['QUALITY_TOLERANCE'] == '0.01' + cs = css[1] + assert cs['UNITS'] == OPTION_UNITS_GPM + assert cs['PRESSURE'] == OPTION_PRESSURE_PSI + assert cs['HEADLOSS'] == OPTION_HEADLOSS_HW + assert cs['QUALITY'] == f'{OPTION_QUALITY_TRACE} 2' + assert cs['UNBALANCED'] == OPTION_UNBALANCED_STOP + assert cs['PATTERN'] == '1' + assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_DDA + assert cs['DEMAND MULTIPLIER'] == '1.0' + assert cs['EMITTER EXPONENT'] == '0.5' + assert cs['VISCOSITY'] == '1.0' + assert cs['DIFFUSIVITY'] == '1.0' + assert cs['SPECIFIC GRAVITY'] == '1.0' + assert cs['TRIALS'] == '40' + assert cs['ACCURACY'] == '0.001' + assert cs['FLOWCHANGE'] == '0.0' + assert cs['MINIMUM PRESSURE'] == '0.0' + assert cs['REQUIRED PRESSURE'] == '0.1' + assert cs['PRESSURE EXPONENT'] == '0.5' + assert cs['TOLERANCE'] == '0.01' + assert cs['HTOL'] == '0.0005' + assert cs['QTOL'] == '0.0001' + + o3 = get_option_v3(p) + + o3['DEMAND_MODEL'] = OPTION_V3_DEMAND_MODEL_CONSTRAINED + + css = set_option_v3(p, ChangeSet(o3)).operations + cs = css[0] + assert cs['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_CONSTRAINED + cs = css[1] + assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_PDA + + css = execute_undo(p).operations + cs = css[0] + assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_DDA + cs = css[1] + assert cs['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_FIXED + + css = execute_redo(p).operations + cs = css[0] + assert cs['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_CONSTRAINED + cs = css[1] + assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_PDA + + o3 = get_option_v3(p) + + o3['DEMAND_MODEL'] = OPTION_V3_DEMAND_MODEL_LOGISTIC + + css = set_option_v3(p, ChangeSet(o3)).operations + cs = css[0] + assert cs['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_LOGISTIC + cs = css[1] + assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_PDA + + css = execute_undo(p).operations + cs = css[0] + assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_PDA + cs = css[1] + assert cs['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_CONSTRAINED + + css = execute_redo(p).operations + cs = css[0] + assert cs['DEMAND_MODEL'] == OPTION_V3_DEMAND_MODEL_LOGISTIC + cs = css[1] + assert cs['DEMAND MODEL'] == OPTION_DEMAND_MODEL_PDA self.leave(p)