From 12e61b7b9c6aa7580e7cef85ce42ae435b43b6f1 Mon Sep 17 00:00:00 2001 From: wqy Date: Sat, 3 Sep 2022 00:43:09 +0800 Subject: [PATCH] Refine tjnetwork_new and add junction api --- tjnetwork_new.py | 76 ++++++++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 31 deletions(-) diff --git a/tjnetwork_new.py b/tjnetwork_new.py index 040e364..c51e5cf 100644 --- a/tjnetwork_new.py +++ b/tjnetwork_new.py @@ -7,6 +7,8 @@ PIPE = "PIPE" PUMP = "PUMP" VALVE = "VALVE" +# project + def have_project(name: str) -> bool: return api.have_project(name) @@ -25,17 +27,18 @@ def open_project(name: str) -> None: def close_project(name: str) -> None: return api.close_project(name) +# operation + def undo(name: str) -> None: return api.undo(name) def redo(name: str) -> None: return api.redo(name) -def add_node(name: str, node_id: str, node_type: str) -> None: - return api.add_node(name, node_id, node_type) +# 0.base -def have_node(name: str, node_id: str) -> bool: - return api.have_node(name, node_id) +def is_node(name: str, node_id: str) -> bool: + return api.is_node(name, node_id) def is_junction(name: str, node_id: str) -> bool: return api.is_junction(name, node_id) @@ -46,14 +49,8 @@ def is_reservoir(name: str, node_id: str) -> bool: def is_tank(name: str, node_id: str) -> bool: return api.is_tank(name, node_id) -def delete_node(name: str, node_id: str) -> None: - return api.delete_node(name, node_id) - -def add_link(name: str, link_id: str, link_type: str) -> None: - return api.add_link(name, link_id, link_type) - -def have_link(name: str, link_id: str) -> bool: - return api.have_link(name, link_id) +def is_link(name: str, link_id: str) -> bool: + return api.is_link(name, link_id) def is_pipe(name: str, link_id: str) -> bool: return api.is_pipe(name, link_id) @@ -64,29 +61,46 @@ def is_pump(name: str, link_id: str) -> bool: def is_valve(name: str, link_id: str) -> bool: return api.is_valve(name, link_id) -def delete_link(name: str, link_id: str) -> None: - return api.delete_link(name, link_id) +def is_curve(name: str, curve_id: str) -> bool: + return api.is_curve(name, curve_id) -def add_curve(name: str, curve_id: str) -> None: - return api.add_curve(name, curve_id) - -def have_curve(name: str, curve_id: str) -> bool: - return api.have_curve(name, curve_id) - -def delete_curve(name: str, curve_id: str) -> None: - return api.delete_curve(name, curve_id) - -def add_pattern(name: str, pattern_id: str) -> None: - return api.add_pattern(name, pattern_id) - -def have_pattern(name: str, pattern_id: str) -> bool: - return api.have_pattern(name, pattern_id) - -def delete_pattern(name: str, pattern_id: str) -> None: - return api.delete_pattern(name, pattern_id) +def is_pattern(name: str, pattern_id: str) -> bool: + return api.is_pattern(name, pattern_id) +# 1.title def set_title(name: str, title: str) -> None: return api.set_title(name, title) def get_title(name: str) -> str: return api.get_title(name) + +# 2.junction +def add_junction(name: str, junction_id: str, x: float, y: float, elevation: float) -> None: + return api.add_junction(name, junction_id, x, y, elevation) + +def delete_junction(name: str, junction_id: str) -> None: + return api.delete_junction(name, junction_id) + +def get_junction_elevation(name: str, junction_id: str) -> float | None: + return api.get_junction_elevation(name, junction_id) + +def get_junction_demand(name: str, junction_id: str) -> float | str | None: + return api.get_junction_demand(name, junction_id) + +def get_junction_pattern(name: str, junction_id: str) -> str | None: + return api.get_junction_pattern(name, junction_id) + +def get_junction_coord(name: str, junction_id: str) -> dict[str, float] | None: + return api.get_junction_coord(name, junction_id) + +def set_junction_elevation(name: str, junction_id: str, elevation: float) -> None: + return api.set_junction_elevation(name, junction_id, elevation) + +def set_junction_demand(name: str, junction_id: str, demand: float) -> None: + return api.set_junction_demand(name, junction_id, demand) + +def set_junction_pattern(name: str, junction_id: str, pattern: str) -> None: + return api.set_junction_pattern(name, junction_id, pattern) + +def set_junction_coord(name: str, junction_id: str, x: float, y: float) -> None: + return api.set_junction_coord(name, junction_id, x, y)