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

Refine node getter api

Browse Source
This commit is contained in:
wqy
2022-09-22 21:41:26 +08:00
parent 345ce9a98d
commit 90f02752e9
6 changed files with 126 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
tjnetwork.py
View File

@@ -1,3 +1,4 @@
from typing import Any
import api
@@ -166,18 +167,6 @@ def add_junction(name: str, junction_id: str, x: float, y: float, elevation: flo
def delete_junction(name: str, junction_id: str) -> ChangeSet:
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) -> ChangeSet:
return api.set_junction_elevation(name, junction_id, elevation)
@@ -190,6 +179,12 @@ def set_junction_pattern(name: str, junction_id: str, pattern: str) -> ChangeSet
def set_junction_coord(name: str, junction_id: str, x: float, y: float) -> ChangeSet:
return api.set_junction_coord(name, junction_id, x, y)
def get_junction_property_names(name: str) -> list[str]:
return api.get_junction_property_names(name)
def get_junction_properties(name: str, id: str) -> dict[str, Any] | None:
return api.get_junction_properties(name, id)
############################################################
# reservoir 3.[RESERVOIRS]
@@ -201,15 +196,6 @@ def add_reservoir(name: str, reservoir_id: str, x: float, y: float, head: float)
def delete_reservoir(name: str, reservoir_id: str) -> ChangeSet:
return api.delete_reservoir(name, reservoir_id)
def get_reservoir_head(name: str, reservoir_id: str) -> float | None:
return api.get_reservoir_head(name, reservoir_id)
def get_reservoir_pattern(name: str, reservoir_id: str) -> str | None:
return api.get_reservoir_pattern(name, reservoir_id)
def get_reservoir_coord(name: str, reservoir_id: str) -> dict[str, float] | None:
return api.get_reservoir_coord(name, reservoir_id)
def set_reservoir_head(name: str, reservoir_id: str, head: float) -> ChangeSet:
return api.set_reservoir_head(name, reservoir_id, head)
@@ -219,6 +205,12 @@ def set_reservoir_pattern(name: str, reservoir_id: str, pattern: str) -> ChangeS
def set_reservoir_coord(name: str, reservoir_id: str, x: float, y: float) -> ChangeSet:
return api.set_reservoir_coord(name, reservoir_id, x, y)
def get_reservoir_property_names(name: str) -> list[str]:
return api.get_reservoir_property_names(name)
def get_reservoir_properties(name: str, id: str) -> dict[str, Any] | None:
return api.get_reservoir_properties(name, id)
############################################################
# tank 4.[TANKS]
@@ -230,33 +222,6 @@ def add_tank(name: str, tank_id: str, x: float, y: float, elevation: float, init
def delete_tank(name: str, tank_id: str) -> ChangeSet:
return api.delete_tank(name, tank_id)
def get_tank_elevation(name: str, tank_id: str) -> float | None:
return api.get_tank_elevation(name, tank_id)
def get_tank_init_level(name: str, tank_id: str) -> float | None:
return api.get_tank_init_level(name, tank_id)
def get_tank_min_level(name: str, tank_id: str) -> float | None:
return api.get_tank_min_level(name, tank_id)
def get_tank_max_level(name: str, tank_id: str) -> float | None:
return api.get_tank_max_level(name, tank_id)
def get_tank_diameter(name: str, tank_id: str) -> float | None:
return api.get_tank_diameter(name, tank_id)
def get_tank_min_vol(name: str, tank_id: str) -> float | None:
return api.get_tank_min_vol(name, tank_id)
def get_tank_vol_curve(name: str, tank_id: str) -> str | None:
return api.get_tank_vol_curve(name, tank_id)
def get_tank_overflow(name: str, tank_id: str) -> str | None:
return api.get_tank_overflow(name, tank_id)
def get_tank_coord(name: str, tank_id: str) -> dict[str, float] | None:
return api.get_tank_coord(name, tank_id)
def set_tank_elevation(name: str, tank_id: str, elevation: float) -> ChangeSet:
return api.set_tank_elevation(name, tank_id, elevation)
@@ -284,6 +249,12 @@ def set_tank_overflow(name: str, tank_id: str, overflow: str) -> ChangeSet:
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_property_names(name: str) -> list[str]:
return api.get_tank_property_names(name)
def get_tank_properties(name: str, id: str) -> dict[str, Any] | None:
return api.get_tank_properties(name, id)
############################################################
# pipe 4.[PIPES]