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

Rename energy table field

Browse Source
This commit is contained in:
WQY\qiong
2022-11-04 16:12:34 +08:00
parent 1d465b8a64
commit a5818ec463
4 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
test_tjnetwork.py
View File

@@ -1962,7 +1962,7 @@ class TestApi:
self.enter(p)
ge = get_pump_energy(p, 'p0')
assert ge['id'] == 'p0'
assert ge['pump'] == 'p0'
assert ge['price'] == None
assert ge['pattern'] == None
assert ge['effic'] == None
@@ -1971,32 +1971,32 @@ class TestApi:
add_junction(p, ChangeSet({'id': 'j2', 'x': 0.0, 'y': 10.0, 'elevation': 20.0}))
add_pump(p, ChangeSet({'id': 'p0', 'node1': 'j1', 'node2': 'j2', 'power': 0.0}))
set_pump_energy(p, ChangeSet({'id' : 'p0'}))
set_pump_energy(p, ChangeSet({'pump' : 'p0'}))
ge = get_pump_energy(p, 'p0')
assert ge['id'] == 'p0'
assert ge['pump'] == 'p0'
assert ge['price'] == None
assert ge['pattern'] == None
assert ge['effic'] == None
set_pump_energy(p, ChangeSet({'id' : 'p0', 'price': 0.0}))
set_pump_energy(p, ChangeSet({'pump' : 'p0', 'price': 0.0}))
ge = get_pump_energy(p, 'p0')
assert ge['id'] == 'p0'
assert ge['pump'] == 'p0'
assert ge['price'] == 0.0
assert ge['pattern'] == None
assert ge['effic'] == None
add_pattern(p, ChangeSet({'id' : 'pa0', 'factors': [1.0, 2.0, 3.0]}))
set_pump_energy(p, ChangeSet({'id' : 'p0', 'pattern': 'pa0'}))
set_pump_energy(p, ChangeSet({'pump' : 'p0', 'pattern': 'pa0'}))
ge = get_pump_energy(p, 'p0')
assert ge['id'] == 'p0'
assert ge['pump'] == 'p0'
assert ge['price'] == 0.0
assert ge['pattern'] == 'pa0'
assert ge['effic'] == None
set_curve(p, ChangeSet({'id' : 'c0', 'coords': [{'x': 1.0, 'y': 2.0}, {'x': 2.0, 'y': 1.0}]}))
set_pump_energy(p, ChangeSet({'id' : 'p0', 'effic': 'c0'}))
set_pump_energy(p, ChangeSet({'pump' : 'p0', 'effic': 'c0'}))
ge = get_pump_energy(p, 'p0')
assert ge['id'] == 'p0'
assert ge['pump'] == 'p0'
assert ge['price'] == 0.0
assert ge['pattern'] == 'pa0'
assert ge['effic'] == 'c0'
@@ -2014,10 +2014,10 @@ class TestApi:
add_pattern(p, ChangeSet({'id' : 'pa0', 'factors': [1.0, 2.0, 3.0]}))
set_curve(p, ChangeSet({'id' : 'c0', 'coords': [{'x': 1.0, 'y': 2.0}, {'x': 2.0, 'y': 1.0}]}))
cs = set_pump_energy(p, ChangeSet({'id' : 'p0'})).operations[0]
cs = set_pump_energy(p, ChangeSet({'pump' : 'p0'})).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == None
assert cs['pattern'] == None
assert cs['effic'] == None
@@ -2025,7 +2025,7 @@ class TestApi:
cs = execute_undo(p).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == None
assert cs['pattern'] == None
assert cs['effic'] == None
@@ -2033,15 +2033,15 @@ class TestApi:
cs = execute_redo(p).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == None
assert cs['pattern'] == None
assert cs['effic'] == None
cs = set_pump_energy(p, ChangeSet({'id' : 'p0', 'price': 0.0})).operations[0]
cs = set_pump_energy(p, ChangeSet({'pump' : 'p0', 'price': 0.0})).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == 0.0
assert cs['pattern'] == None
assert cs['effic'] == None
@@ -2049,7 +2049,7 @@ class TestApi:
cs = execute_undo(p).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == None
assert cs['pattern'] == None
assert cs['effic'] == None
@@ -2057,15 +2057,15 @@ class TestApi:
cs = execute_redo(p).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == 0.0
assert cs['pattern'] == None
assert cs['effic'] == None
cs = set_pump_energy(p, ChangeSet({'id' : 'p0', 'pattern': 'pa0'})).operations[0]
cs = set_pump_energy(p, ChangeSet({'pump' : 'p0', 'pattern': 'pa0'})).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == 0.0
assert cs['pattern'] == 'pa0'
assert cs['effic'] == None
@@ -2073,7 +2073,7 @@ class TestApi:
cs = execute_undo(p).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == 0.0
assert cs['pattern'] == None
assert cs['effic'] == None
@@ -2081,15 +2081,15 @@ class TestApi:
cs = execute_redo(p).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == 0.0
assert cs['pattern'] == 'pa0'
assert cs['effic'] == None
cs = set_pump_energy(p, ChangeSet({'id' : 'p0', 'effic': 'c0'})).operations[0]
cs = set_pump_energy(p, ChangeSet({'pump' : 'p0', 'effic': 'c0'})).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == 0.0
assert cs['pattern'] == 'pa0'
assert cs['effic'] == 'c0'
@@ -2097,7 +2097,7 @@ class TestApi:
cs = execute_undo(p).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == 0.0
assert cs['pattern'] == 'pa0'
assert cs['effic'] == None
@@ -2105,15 +2105,15 @@ class TestApi:
cs = execute_redo(p).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == 0.0
assert cs['pattern'] == 'pa0'
assert cs['effic'] == 'c0'
cs = set_pump_energy(p, ChangeSet({'id' : 'p0', 'price': None, 'pattern': None, 'effic': None})).operations[0]
cs = set_pump_energy(p, ChangeSet({'pump' : 'p0', 'price': None, 'pattern': None, 'effic': None})).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == None
assert cs['pattern'] == None
assert cs['effic'] == None
@@ -2121,7 +2121,7 @@ class TestApi:
cs = execute_undo(p).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == 0.0
assert cs['pattern'] == 'pa0'
assert cs['effic'] == 'c0'
@@ -2129,15 +2129,15 @@ class TestApi:
cs = execute_redo(p).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == None
assert cs['pattern'] == None
assert cs['effic'] == None
cs = set_pump_energy(p, ChangeSet({'id' : 'p0', 'price': 0.0, 'pattern': 'pa0', 'effic': 'c0'})).operations[0]
cs = set_pump_energy(p, ChangeSet({'pump' : 'p0', 'price': 0.0, 'pattern': 'pa0', 'effic': 'c0'})).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == 0.0
assert cs['pattern'] == 'pa0'
assert cs['effic'] == 'c0'
@@ -2145,7 +2145,7 @@ class TestApi:
cs = execute_undo(p).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == None
assert cs['pattern'] == None
assert cs['effic'] == None
@@ -2153,7 +2153,7 @@ class TestApi:
cs = execute_redo(p).operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'pump_energy'
assert cs['id'] == 'p0'
assert cs['pump'] == 'p0'
assert cs['price'] == 0.0
assert cs['pattern'] == 'pa0'
assert cs['effic'] == 'c0'