diff --git a/api/__init__.py b/api/__init__.py index ef57338..499884c 100644 --- a/api/__init__.py +++ b/api/__init__.py @@ -7,6 +7,7 @@ from .operation import execute_redo as redo from .operation import have_snapshot, take_snapshot, pick_snapshot from .operation import have_transaction, start_transaction, commit_transaction, abort_transaction +from .s0_base import JUNCTION, RESERVOIR, TANK, PIPE, PUMP, VALVE from .s0_base import is_node, is_junction, is_reservoir, is_tank from .s0_base import is_link, is_pipe, is_pump, is_valve from .s0_base import is_curve diff --git a/tjnetwork_new.py b/tjnetwork_new.py index 0d123a3..d23f032 100644 --- a/tjnetwork_new.py +++ b/tjnetwork_new.py @@ -5,12 +5,12 @@ import api # enum ############################################################ -JUNCTION = "JUNCTION" -RESERVOIR = "RESERVOIR" -TANK = "TANK" -PIPE = "PIPE" -PUMP = "PUMP" -VALVE = "VALVE" +JUNCTION = api.JUNCTION +RESERVOIR = api.RESERVOIR +TANK = api.TANK +PIPE = api.PIPE +PUMP = api.PUMP +VALVE = api.VALVE ############################################################