Update tank api and test
This commit is contained in:
wqy
@@ -19,12 +19,11 @@ from .s0_base import get_node_links
|
||||
from .s1_title import set_title, get_title
|
||||
|
||||
from .s2_junctions import get_junction_schema, add_junction, get_junction, set_junction, delete_junction
|
||||
|
||||
from .s3_reservoirs import get_reservoir_schema, add_reservoir, get_reservoir, set_reservoir, delete_reservoir
|
||||
|
||||
from .s4_tanks import OVERFLOW_YES, OVERFLOW_NO
|
||||
from .s4_tanks import add_tank, delete_tank
|
||||
from .s4_tanks import set_tank_elevation, set_tank_init_level, set_tank_min_level, set_tank_max_level, set_tank_diameter, set_tank_min_vol, set_tank_vol_curve, set_tank_overflow, set_tank_coord
|
||||
from .s4_tanks import get_tank_property_names, get_tank_properties
|
||||
from .s4_tanks import get_tank_schema, add_tank, get_tank, set_tank, delete_tank
|
||||
|
||||
from .s5_pipes import PIPE_STATUS_OPEN, PIPE_STATUS_CLOSED, PIPE_STATUS_CV
|
||||
from .s5_pipes import add_pipe, delete_pipe
|
||||
|
||||
@@ -21,7 +21,7 @@ def get_junction_schema(name: str) -> dict[str, dict[str, Any]]:
|
||||
|
||||
|
||||
def _query_junction(name: str, id: str) -> Row | None:
|
||||
return read(name, f"select id, elevation, demand, pattern from junctions where id = '{id}'")
|
||||
return read(name, f"select * from junctions where id = '{id}'")
|
||||
|
||||
|
||||
def add_junction(name: str, id: str, x: float, y: float, elevation: float) -> ChangeSet:
|
||||
@@ -59,6 +59,9 @@ def get_junction(name: str, id: str) -> dict[str, Any] | None:
|
||||
def set_junction(name: str, id: str, properties: dict[str, Any]) -> ChangeSet:
|
||||
if not is_junction(name, id):
|
||||
return ChangeSet()
|
||||
if 'pattern' in properties:
|
||||
if not is_pattern(properties['pattern']):
|
||||
return ChangeSet()
|
||||
|
||||
old = Serialize(get_junction(name, id), schema).to_storage()
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ def get_reservoir_schema(name: str) -> dict[str, dict[str, Any]]:
|
||||
|
||||
|
||||
def _query_reservoir(name: str, id: str) -> Row | None:
|
||||
return read(name, f"select id, head, pattern from reservoirs where id = '{id}'")
|
||||
return read(name, f"select * from reservoirs where id = '{id}'")
|
||||
|
||||
|
||||
def add_reservoir(name: str, id: str, x: float, y: float, head: float) -> ChangeSet:
|
||||
@@ -57,6 +57,9 @@ def get_reservoir(name: str, id: str) -> dict[str, Any] | None:
|
||||
def set_reservoir(name: str, id: str, properties: dict[str, Any]) -> ChangeSet:
|
||||
if not is_reservoir(name, id):
|
||||
return ChangeSet()
|
||||
if 'pattern' in properties:
|
||||
if not is_pattern(properties['pattern']):
|
||||
return ChangeSet()
|
||||
|
||||
old = Serialize(get_reservoir(name, id), schema).to_storage()
|
||||
|
||||
|
||||
120
api/s4_tanks.py
120
api/s4_tanks.py
@@ -4,12 +4,131 @@ from .s0_base import *
|
||||
from .change_set import ChangeSet
|
||||
from .s24_coordinates import *
|
||||
from .utility import *
|
||||
from .schema import *
|
||||
|
||||
|
||||
OVERFLOW_YES = 'yes'
|
||||
OVERFLOW_NO = 'no'
|
||||
|
||||
|
||||
schema: dict[str, dict[str, Any]] = { \
|
||||
'id' : define_property(str_type, False, True), \
|
||||
'elevation' : define_property(float_type), \
|
||||
'init_level': define_property(float_type), \
|
||||
'min_level' : define_property(float_type), \
|
||||
'max_level' : define_property(float_type), \
|
||||
'diameter' : define_property(float_type), \
|
||||
'min_vol' : define_property(float_type), \
|
||||
'vol_curve' : define_property(str_type, True), \
|
||||
'overflow' : define_property(str_type, True), \
|
||||
'coord' : define_property(client_point_type), \
|
||||
'links' : define_property(str_list_type, False, True)}
|
||||
|
||||
|
||||
def get_tank_schema(name: str) -> dict[str, dict[str, Any]]:
|
||||
return schema
|
||||
|
||||
|
||||
def _query_tank(name: str, id: str) -> Row | None:
|
||||
return read(name, f"select * from tanks where id = '{id}'")
|
||||
|
||||
|
||||
def add_tank(name: str, id: str, x: float, y: float, elevation: float, init_level: float = 0, min_level: float = 0, max_level: float = 0, diameter: float = 0, min_vol: float = 0) -> ChangeSet:
|
||||
if is_tank(name, id):
|
||||
return ChangeSet()
|
||||
|
||||
sql = f"insert into _node (id, type) values ('{id}', '{TANK}');"
|
||||
sql += f"\ninsert into tanks (id, elevation, init_level, min_level, max_level, diameter, min_vol) values ('{id}', {elevation}, {init_level}, {min_level}, {max_level}, {diameter}, {min_vol});"
|
||||
sql += f"\ninsert into coordinates (node, coord) values ('{id}', '({x}, {y})');"
|
||||
|
||||
undo = f"delete from coordinates where node = ''{id}'';"
|
||||
undo += f"\ndelete from tanks where id = ''{id}'';"
|
||||
undo += f"\ndelete from _node where id = ''{id}'';"
|
||||
|
||||
write(name, sql)
|
||||
add_operation(name, sql.replace("'", "''"), undo, 'add_tank', API_ADD, TANK, id)
|
||||
return get_current_change_set(name)
|
||||
|
||||
|
||||
def get_tank(name: str, id: str) -> dict[str, Any] | None:
|
||||
row = _query_tank(name, id)
|
||||
if row == None:
|
||||
return None
|
||||
|
||||
ps: dict[str, str] = {}
|
||||
ps['id'] = id
|
||||
ps['elevation'] = float(row['elevation'])
|
||||
ps['init_level'] = float(row['init_level'])
|
||||
ps['min_level'] = float(row['min_level'])
|
||||
ps['max_level'] = float(row['max_level'])
|
||||
ps['diameter'] = float(row['diameter'])
|
||||
ps['min_vol'] = float(row['min_vol'])
|
||||
ps['vol_curve'] = row['vol_curve']
|
||||
ps['overflow'] = row['overflow']
|
||||
ps['coord'] = get_node_coord(name, id)
|
||||
ps['links'] = get_node_links(name, id)
|
||||
return ps
|
||||
|
||||
|
||||
def set_tank(name: str, id: str, properties: dict[str, Any]) -> ChangeSet:
|
||||
if not is_tank(name, id):
|
||||
return ChangeSet()
|
||||
if 'vol_curve' in properties:
|
||||
if not is_curve(properties['vol_curve']):
|
||||
return ChangeSet()
|
||||
if 'overflow' in properties:
|
||||
if properties['overflow'] != OVERFLOW_YES and properties['overflow'] != OVERFLOW_NO:
|
||||
return ChangeSet()
|
||||
|
||||
old = Serialize(get_tank(name, id), schema).to_storage()
|
||||
|
||||
new = get_tank(name, id)
|
||||
ps: list[str] = []
|
||||
for key in properties:
|
||||
if key in schema and schema[key]['readonly'] == False:
|
||||
new[key] = properties[key]
|
||||
ps.append(key)
|
||||
new = Serialize(new, schema).to_execution()
|
||||
|
||||
sql = f"update tanks set elevation = {new['elevation']}, \
|
||||
init_level = {new['init_level']}, min_level = {new['min_level']}, max_level = {new['max_level']}, \
|
||||
diameter = {new['diameter']}, min_vol = {new['min_vol']}, vol_curve = {new['vol_curve']}, overflow = {new['overflow']} where id = '{id}';"
|
||||
undo = ""
|
||||
if 'coord' in ps:
|
||||
sql += f"\nupdate coordinates set coord = {new['coord']} where node = '{id}';"
|
||||
undo = f"update coordinates set coord = {old['coord']} where node = ''{id}'';"
|
||||
undo += f"\nupdate tanks set elevation = {old['elevation']}, \
|
||||
init_level = {old['init_level']}, min_level = {old['min_level']}, max_level = {old['max_level']}, \
|
||||
diameter = {old['diameter']}, min_vol = {old['min_vol']}, vol_curve = {old['vol_curve']}, overflow = {old['overflow']} where id = ''{id}'';"
|
||||
|
||||
write(name, sql)
|
||||
add_operation(name, sql.replace("'", "''"), undo, 'set_tank', API_UPDATE, TANK, id, ps)
|
||||
return get_current_change_set(name)
|
||||
|
||||
|
||||
def delete_tank(name: str, id: str) -> ChangeSet:
|
||||
row = get_tank(name, id)
|
||||
if row == None:
|
||||
return ChangeSet()
|
||||
|
||||
old = Serialize(get_tank(name, id), schema).to_storage()
|
||||
|
||||
sql = f"delete from coordinates where node = '{id}';"
|
||||
sql += f"\ndelete from tanks where id = '{id}';"
|
||||
sql += f"\ndelete from _node where id = '{id}';"
|
||||
|
||||
undo = f"insert into _node (id, type) values (''{id}'', ''{TANK}'');"
|
||||
undo += f"\ninsert into tanks (id, elevation, init_level, min_level, max_level, diameter, min_vol, vol_curve, overflow) \
|
||||
values (''{id}'', {old['elevation']}, {old['init_level']}, {old['min_level']}, {old['max_level']}, {old['diameter']}, {old['min_vol']}, {old['vol_curve']}, {old['overflow']});"
|
||||
undo += f"\ninsert into coordinates (node, coord) values (''{id}'', {old['coord']});"
|
||||
|
||||
write(name, sql)
|
||||
add_operation(name, sql.replace("'", "''"), undo, 'delete_tank', API_DELETE, TANK, id)
|
||||
return get_current_change_set(name)
|
||||
|
||||
|
||||
|
||||
'''
|
||||
def add_tank(name: str, id: str, x: float, y: float, elevation: float, init_level: float = 0, min_level: float = 0, max_level: float = 0, diameter: float = 0, min_vol: float = 0) -> ChangeSet:
|
||||
sql = f"insert into tanks (id, elevation, init_level, min_level, max_level, diameter, min_vol) values ('{id}', {elevation}, {init_level}, {min_level}, {max_level}, {diameter}, {min_vol});"
|
||||
undo_sql = f'delete from tanks where id = "{id}";'
|
||||
@@ -120,3 +239,4 @@ def get_tank_properties(name: str, id: str) -> dict[str, Any] | None:
|
||||
ps['coord'] = get_node_coord(name, id)
|
||||
ps['links'] = get_node_links(name, id)
|
||||
return ps
|
||||
'''
|
||||
|
||||
@@ -101,7 +101,7 @@ class TestApi:
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == JUNCTION
|
||||
assert change_set.operations[0]['id'] == 'j0'
|
||||
assert 'demand' in change_set.operations[0]['properties']
|
||||
assert change_set.operations[0]['properties'] == ['demand']
|
||||
assert get_junction(p, 'j0')['demand'] == 100.0
|
||||
|
||||
# TODO: pattern
|
||||
@@ -173,7 +173,7 @@ class TestApi:
|
||||
change_set = set_reservoir(p, 'r0', {'head': 100.0})
|
||||
assert change_set.operations[0]['type'] == RESERVOIR
|
||||
assert change_set.operations[0]['id'] == 'r0'
|
||||
assert 'head' in change_set.operations[0]['properties']
|
||||
assert change_set.operations[0]['properties'] == ['head']
|
||||
assert get_reservoir(p, 'r0')['head'] == 100.0
|
||||
|
||||
assert get_reservoir(p, 'r0')['coord'] == { 'x': 0.0, 'y': 10.0 }
|
||||
@@ -181,7 +181,7 @@ class TestApi:
|
||||
change_set = set_reservoir(p, 'r0', {'coord': {'x': 100.0, 'y': 200.0}})
|
||||
assert change_set.operations[0]['type'] == RESERVOIR
|
||||
assert change_set.operations[0]['id'] == 'r0'
|
||||
assert 'coord' in change_set.operations[0]['properties']
|
||||
assert change_set.operations[0]['properties'] == ['coord']
|
||||
assert get_reservoir(p, 'r0')['coord'] == { 'x': 100.0, 'y': 200.0 }
|
||||
|
||||
# TODO: pattern
|
||||
@@ -197,7 +197,7 @@ class TestApi:
|
||||
|
||||
self.leave(p)
|
||||
|
||||
'''
|
||||
|
||||
def test_tank(self):
|
||||
p = "test_tank"
|
||||
|
||||
@@ -223,73 +223,73 @@ class TestApi:
|
||||
assert tanks[0] == 't0'
|
||||
assert tanks[1] == 't1'
|
||||
|
||||
assert get_tank_properties(p, 't0')['elevation'] == 10.0
|
||||
change_set = set_tank_elevation(p, 't0', 100.0)
|
||||
assert get_tank(p, 't0')['elevation'] == 10.0
|
||||
change_set = set_tank(p, 't0', {'elevation': 100.0})
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == TANK
|
||||
assert change_set.operations[0]['id'] == "t0"
|
||||
assert change_set.operations[0]['property'] == 'elevation'
|
||||
assert get_tank_properties(p, 't0')['elevation'] == 100.0
|
||||
assert change_set.operations[0]['properties'] == ['elevation']
|
||||
assert get_tank(p, 't0')['elevation'] == 100.0
|
||||
|
||||
assert get_tank_properties(p, 't0')['init_level'] == 10.0
|
||||
change_set = set_tank_init_level(p, 't0', 100.0)
|
||||
assert get_tank(p, 't0')['init_level'] == 10.0
|
||||
change_set = set_tank(p, 't0', {'init_level': 100.0})
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == TANK
|
||||
assert change_set.operations[0]['id'] == "t0"
|
||||
assert change_set.operations[0]['property'] == 'init_level'
|
||||
assert get_tank_properties(p, 't0')['init_level'] == 100.0
|
||||
assert change_set.operations[0]['properties'] == ['init_level']
|
||||
assert get_tank(p, 't0')['init_level'] == 100.0
|
||||
|
||||
assert get_tank_properties(p, 't0')['min_level'] == 10.0
|
||||
change_set = set_tank_min_level(p, 't0', 100.0)
|
||||
assert get_tank(p, 't0')['min_level'] == 10.0
|
||||
change_set = set_tank(p, 't0', {'min_level': 100.0})
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == TANK
|
||||
assert change_set.operations[0]['id'] == "t0"
|
||||
assert change_set.operations[0]['property'] == 'min_level'
|
||||
assert get_tank_properties(p, 't0')['min_level'] == 100.0
|
||||
assert change_set.operations[0]['properties'] == ['min_level']
|
||||
assert get_tank(p, 't0')['min_level'] == 100.0
|
||||
|
||||
assert get_tank_properties(p, 't0')['max_level'] == 10.0
|
||||
change_set = set_tank_max_level(p, 't0', 100.0)
|
||||
assert get_tank(p, 't0')['max_level'] == 10.0
|
||||
change_set = set_tank(p, 't0', {'max_level': 100.0})
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == TANK
|
||||
assert change_set.operations[0]['id'] == "t0"
|
||||
assert change_set.operations[0]['property'] == 'max_level'
|
||||
assert get_tank_properties(p, 't0')['max_level'] == 100.0
|
||||
assert change_set.operations[0]['properties'] == ['max_level']
|
||||
assert get_tank(p, 't0')['max_level'] == 100.0
|
||||
|
||||
assert get_tank_properties(p, 't0')['diameter'] == 10.0
|
||||
change_set = set_tank_diameter(p, 't0', 100.0)
|
||||
assert get_tank(p, 't0')['diameter'] == 10.0
|
||||
change_set = set_tank(p, 't0', {'diameter': 100.0})
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == TANK
|
||||
assert change_set.operations[0]['id'] == "t0"
|
||||
assert change_set.operations[0]['property'] == 'diameter'
|
||||
assert get_tank_properties(p, 't0')['diameter'] == 100.0
|
||||
assert change_set.operations[0]['properties'] == ['diameter']
|
||||
assert get_tank(p, 't0')['diameter'] == 100.0
|
||||
|
||||
assert get_tank_properties(p, 't0')['min_vol'] == 10.0
|
||||
change_set = set_tank_min_vol(p, 't0', 100.0)
|
||||
assert get_tank(p, 't0')['min_vol'] == 10.0
|
||||
change_set = set_tank(p, 't0', {'min_vol': 100.0})
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == TANK
|
||||
assert change_set.operations[0]['id'] == "t0"
|
||||
assert change_set.operations[0]['property'] == 'min_vol'
|
||||
assert get_tank_properties(p, 't0')['min_vol'] == 100.0
|
||||
assert change_set.operations[0]['properties'] == ['min_vol']
|
||||
assert get_tank(p, 't0')['min_vol'] == 100.0
|
||||
|
||||
# TODO: vol_curve
|
||||
|
||||
assert get_tank_properties(p, 't') == None
|
||||
assert get_tank_properties(p, 't0')['overflow'] == None
|
||||
change_set = set_tank_overflow(p, 't0', "XXX")
|
||||
assert get_tank(p, 't') == None
|
||||
assert get_tank(p, 't0')['overflow'] == None
|
||||
change_set = set_tank(p, 't0', {'overflow': "XXX"})
|
||||
assert len(change_set.operations) == 0
|
||||
change_set = set_tank_overflow(p, 't0', OVERFLOW_YES)
|
||||
change_set = set_tank(p, 't0', {'overflow': OVERFLOW_YES})
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == TANK
|
||||
assert change_set.operations[0]['id'] == "t0"
|
||||
assert change_set.operations[0]['property'] == 'overflow'
|
||||
assert get_tank_properties(p, 't0')['overflow'] == OVERFLOW_YES
|
||||
assert change_set.operations[0]['properties'] == ['overflow']
|
||||
assert get_tank(p, 't0')['overflow'] == OVERFLOW_YES
|
||||
|
||||
change_set = delete_tank(p, "t0")
|
||||
assert len(change_set.operations) == 1
|
||||
@@ -314,7 +314,7 @@ class TestApi:
|
||||
|
||||
self.leave(p)
|
||||
|
||||
|
||||
'''
|
||||
def test_pipe(self):
|
||||
p = "test_pipe"
|
||||
self.enter(p)
|
||||
@@ -371,49 +371,49 @@ class TestApi:
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PIPE
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'node1'
|
||||
assert change_set.operations[0]['properties'] == 'node1'
|
||||
|
||||
change_set = set_pipe_node2(p, 'p1', 'j4')
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PIPE
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'node2'
|
||||
assert change_set.operations[0]['properties'] == 'node2'
|
||||
|
||||
change_set = set_pipe_length(p, 'p1', 100.0)
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PIPE
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'length'
|
||||
assert change_set.operations[0]['properties'] == 'length'
|
||||
|
||||
change_set = set_pipe_diameter(p, 'p1', 100.0)
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PIPE
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'diameter'
|
||||
assert change_set.operations[0]['properties'] == 'diameter'
|
||||
|
||||
change_set = set_pipe_roughness(p, 'p1', 100.0)
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PIPE
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'roughness'
|
||||
assert change_set.operations[0]['properties'] == 'roughness'
|
||||
|
||||
change_set = set_pipe_minor_loss(p, 'p1', 100.0)
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PIPE
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'minor_loss'
|
||||
assert change_set.operations[0]['properties'] == 'minor_loss'
|
||||
|
||||
change_set = set_pipe_status(p, 'p1', PIPE_STATUS_OPEN)
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PIPE
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'status'
|
||||
assert change_set.operations[0]['properties'] == 'status'
|
||||
|
||||
assert get_pipe_properties(p, 'p1')['node1'] == 'j3'
|
||||
assert get_pipe_properties(p, 'p1')['node2'] == 'j4'
|
||||
@@ -501,14 +501,14 @@ class TestApi:
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PUMP
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'node1'
|
||||
assert change_set.operations[0]['properties'] == 'node1'
|
||||
|
||||
change_set = set_pump_node2(p, 'p1', 'j4')
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == PUMP
|
||||
assert change_set.operations[0]['id'] == 'p1'
|
||||
assert change_set.operations[0]['property'] == 'node2'
|
||||
assert change_set.operations[0]['properties'] == 'node2'
|
||||
|
||||
assert get_pump_properties(p, 'p1')['node1'] == 'j3'
|
||||
assert get_pump_properties(p, 'p1')['node2'] == 'j4'
|
||||
@@ -600,42 +600,42 @@ class TestApi:
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == VALVE
|
||||
assert change_set.operations[0]['id'] == 'v1'
|
||||
assert change_set.operations[0]['property'] == 'node1'
|
||||
assert change_set.operations[0]['properties'] == 'node1'
|
||||
|
||||
change_set = set_valve_node2(p, 'v1', 'j4')
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == VALVE
|
||||
assert change_set.operations[0]['id'] == 'v1'
|
||||
assert change_set.operations[0]['property'] == 'node2'
|
||||
assert change_set.operations[0]['properties'] == 'node2'
|
||||
|
||||
change_set = set_valve_diameter(p, 'v1', 100.0)
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == VALVE
|
||||
assert change_set.operations[0]['id'] == 'v1'
|
||||
assert change_set.operations[0]['property'] == 'diameter'
|
||||
assert change_set.operations[0]['properties'] == 'diameter'
|
||||
|
||||
change_set = set_valve_type(p, 'v1', VALVES_TYPE_GPV)
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == VALVE
|
||||
assert change_set.operations[0]['id'] == 'v1'
|
||||
assert change_set.operations[0]['property'] == 'type'
|
||||
assert change_set.operations[0]['properties'] == 'type'
|
||||
|
||||
change_set = set_valve_setting(p, 'v1', 100.0)
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == VALVE
|
||||
assert change_set.operations[0]['id'] == 'v1'
|
||||
assert change_set.operations[0]['property'] == 'setting'
|
||||
assert change_set.operations[0]['properties'] == 'setting'
|
||||
|
||||
change_set = set_valve_minor_loss(p, 'v1', 100.0)
|
||||
assert len(change_set.operations) == 1
|
||||
assert change_set.operations[0]['operation'] == 'update'
|
||||
assert change_set.operations[0]['type'] == VALVE
|
||||
assert change_set.operations[0]['id'] == 'v1'
|
||||
assert change_set.operations[0]['property'] == 'minor_loss'
|
||||
assert change_set.operations[0]['properties'] == 'minor_loss'
|
||||
|
||||
assert get_valve_properties(p, 'v1')['node1'] == 'j3'
|
||||
assert get_valve_properties(p, 'v1')['node2'] == 'j4'
|
||||
|
||||
44
tjnetwork.py
44
tjnetwork.py
@@ -181,8 +181,8 @@ def add_reservoir(name: str, reservoir_id: str, x: float, y: float, head: float)
|
||||
def get_reservoir(name: str, reservoir_id: str) -> dict[str, Any] | None:
|
||||
return api.get_reservoir(name, reservoir_id)
|
||||
|
||||
def set_reservoir(name: str, junction_id: str, properties: dict[str, Any]) -> ChangeSet:
|
||||
return api.set_reservoir(name, junction_id, properties)
|
||||
def set_reservoir(name: str, reservoir_id: str, properties: dict[str, Any]) -> ChangeSet:
|
||||
return api.set_reservoir(name, reservoir_id, properties)
|
||||
|
||||
def delete_reservoir(name: str, reservoir_id: str) -> ChangeSet:
|
||||
return api.delete_reservoir(name, reservoir_id)
|
||||
@@ -192,45 +192,21 @@ def delete_reservoir(name: str, reservoir_id: str) -> ChangeSet:
|
||||
# tank 4.[TANKS]
|
||||
############################################################
|
||||
|
||||
def get_tank_property_names(name: str) -> list[str]:
|
||||
return api.get_tank_property_names(name)
|
||||
def get_tank_schema(name: str) -> dict[str, dict[str, Any]]:
|
||||
return api.get_tank_schema(name)
|
||||
|
||||
def add_tank(name: str, tank_id: str, x: float, y: float, elevation: float, init_level: float = 0, min_level: float = 0, max_level: float = 0, diameter: float = 0, min_vol: float = 0) -> ChangeSet:
|
||||
return api.add_tank(name, tank_id, x, y, elevation, init_level, min_level, max_level, diameter, min_vol)
|
||||
|
||||
def get_tank(name: str, tank_id: str) -> dict[str, Any] | None:
|
||||
return api.get_tank(name, tank_id)
|
||||
|
||||
def set_tank(name: str, tank_id: str, properties: dict[str, Any]) -> ChangeSet:
|
||||
return api.set_tank(name, tank_id, properties)
|
||||
|
||||
def delete_tank(name: str, tank_id: str) -> ChangeSet:
|
||||
return api.delete_tank(name, tank_id)
|
||||
|
||||
def set_tank_elevation(name: str, tank_id: str, elevation: float) -> ChangeSet:
|
||||
return api.set_tank_elevation(name, tank_id, elevation)
|
||||
|
||||
def set_tank_init_level(name: str, tank_id: str, init_level: float) -> ChangeSet:
|
||||
return api.set_tank_init_level(name, tank_id, init_level)
|
||||
|
||||
def set_tank_min_level(name: str, tank_id: str, min_level: float) -> ChangeSet:
|
||||
return api.set_tank_min_level(name, tank_id, min_level)
|
||||
|
||||
def set_tank_max_level(name: str, tank_id: str, max_level: float) -> ChangeSet:
|
||||
return api.set_tank_max_level(name, tank_id, max_level)
|
||||
|
||||
def set_tank_diameter(name: str, tank_id: str, diameter: float) -> ChangeSet:
|
||||
return api.set_tank_diameter(name, tank_id, diameter)
|
||||
|
||||
def set_tank_min_vol(name: str, tank_id: str, min_vol: float) -> ChangeSet:
|
||||
return api.set_tank_min_vol(name, tank_id, min_vol)
|
||||
|
||||
def set_tank_vol_curve(name: str, tank_id: str, vol_curve: str) -> ChangeSet:
|
||||
return api.set_tank_vol_curve(name, tank_id, vol_curve)
|
||||
|
||||
def set_tank_overflow(name: str, tank_id: str, overflow: str) -> ChangeSet:
|
||||
return api.set_tank_overflow(name, tank_id, overflow)
|
||||
|
||||
def set_tank_coord(name: str, tank_id: str, x: float, y: float) -> ChangeSet:
|
||||
return api.set_tank_coord(name, tank_id, x, y)
|
||||
|
||||
def get_tank_properties(name: str, tank_id: str) -> dict[str, Any] | None:
|
||||
return api.get_tank_properties(name, tank_id)
|
||||
|
||||
|
||||
############################################################
|
||||
# pipe 4.[PIPES]
|
||||
|
||||
Reference in New Issue
Block a user