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

Drop demand & pattern from junction

Browse Source
This commit is contained in:
WQY\qiong
2023-03-01 22:59:40 +08:00
parent e83d3a83a5
commit 628258ef52
6 changed files with 18 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
test_tjnetwork.py
View File

@@ -254,8 +254,6 @@ class TestApi:
assert j0['x'] == 0.0
assert j0['y'] == 10.0
assert j0['elevation'] == 20.0
assert j0['demand'] == None
assert j0['pattern'] == None
assert j0['links'] == []
set_junction(p, ChangeSet({'id': 'j0', 'x': 100.0, 'y': 200.0}))
@@ -267,10 +265,6 @@ class TestApi:
j0 = get_junction(p, 'j0')
assert j0['elevation'] == 100.0
set_junction(p, ChangeSet({'id': 'j0', 'demand': 100.0}))
j0 = get_junction(p, 'j0')
assert j0['demand'] == 100.0
# TODO: pattern
add_junction(p, ChangeSet({'id': 'j1', 'x': 0.0, 'y': 10.0, 'elevation': 20.0}))
@@ -314,8 +308,6 @@ class TestApi:
assert cs['x'] == 0.0
assert cs['y'] == 10.0
assert cs['elevation'] == 20.0
assert cs['demand'] == None
assert cs['pattern'] == None
cs = execute_undo(p).operations[0]
assert cs['operation'] == 'delete'
@@ -329,8 +321,6 @@ class TestApi:
assert cs['x'] == 0.0
assert cs['y'] == 10.0
assert cs['elevation'] == 20.0
assert cs['demand'] == None
assert cs['pattern'] == None
cs = execute_undo(p, True).operations[0]
assert cs['operation'] == 'delete'
@@ -360,8 +350,6 @@ class TestApi:
assert cs['x'] == 0.0
assert cs['y'] == 10.0
assert cs['elevation'] == 20.0
assert cs['demand'] == 100.0
assert cs['pattern'] == None
cs = execute_redo(p).operations[0]
assert cs['operation'] == 'delete'
@@ -375,8 +363,6 @@ class TestApi:
assert cs['x'] == 0.0
assert cs['y'] == 10.0
assert cs['elevation'] == 20.0
assert cs['demand'] == 100.0
assert cs['pattern'] == None
cs = execute_redo(p)
assert len(cs.operations) == 0
@@ -391,8 +377,6 @@ class TestApi:
assert cs['x'] == 100.0
assert cs['y'] == 200.0
assert cs['elevation'] == 20.0
assert cs['demand'] == 100.0
assert cs['pattern'] == None
cs = execute_undo(p).operations[0]
assert cs['operation'] == 'update'
@@ -401,8 +385,6 @@ class TestApi:
assert cs['x'] == 0.0
assert cs['y'] == 10.0
assert cs['elevation'] == 20.0
assert cs['demand'] == 100.0
assert cs['pattern'] == None
self.leave(p)
@@ -1699,12 +1681,8 @@ class TestApi:
assert ds[1]['pattern'] == None
assert ds[1]['category'] == None
assert get_junction(p, 'j1')['demand'] == 10.0
set_demand(p, ChangeSet({'junction': 'j1', 'demands': []}))
assert get_junction(p, 'j1')['demand'] == None
d = get_demand(p, 'j1')
assert d['junction'] == 'j1'
assert d['demands'] == []
@@ -1733,20 +1711,10 @@ class TestApi:
assert ds[1]['demand'] == 20.0
assert ds[1]['pattern'] == None
assert ds[1]['category'] == None
cs = result.operations[1]
assert cs['operation'] == API_UPDATE
assert cs['type'] == JUNCTION
assert cs['id'] == 'j1'
assert cs['demand'] == 10.0
result = execute_undo(p)
cs = result.operations[0]
assert cs['operation'] == API_UPDATE
assert cs['type'] == JUNCTION
assert cs['id'] == 'j1'
assert cs['demand'] == None
cs = result.operations[1]
assert cs['operation'] == API_UPDATE
assert cs['type'] == 'demand'
assert cs['junction'] == 'j1'
assert len(cs['demands']) == 0
@@ -1764,11 +1732,6 @@ class TestApi:
assert ds[1]['demand'] == 20.0
assert ds[1]['pattern'] == None
assert ds[1]['category'] == None
cs = result.operations[1]
assert cs['operation'] == API_UPDATE
assert cs['type'] == JUNCTION
assert cs['id'] == 'j1'
assert cs['demand'] == 10.0
self.leave(p)
@@ -1971,14 +1934,13 @@ class TestApi:
self.enter(p)
add_pattern(p, ChangeSet({'id' : 'p0', 'factors': [1.0, 2.0, 3.0]}))
add_junction(p, ChangeSet({'id': 'j0', 'x': 0.0, 'y': 10.0, 'elevation': 20.0, 'pattern': 'p0'}))
add_junction(p, ChangeSet({'id': 'j0', 'x': 0.0, 'y': 10.0, 'elevation': 20.0}))
add_reservoir(p, ChangeSet({'id': 'r0', 'x': 0.0, 'y': 10.0, 'head': 20.0, 'pattern': 'p0'}))
add_pump(p, ChangeSet({'id': 'pump0', 'node1': 'j0', 'node2': 'r0', 'power': 0.0, 'pattern': 'p0'}))
set_demand(p, ChangeSet({'junction': 'j0', 'demands': [{'demand': 10.0, 'pattern': 'p0', 'category': 'x'}, {'demand': 20.0, 'pattern': 'p0', 'category': None}]}))
set_pump_energy(p, ChangeSet({'pump' : 'pump0', 'pattern': 'p0'}))
add_source(p, ChangeSet({'node': 'j0', 's_type': SOURCE_TYPE_CONCEN, 'strength': 10.0, 'pattern': 'p0' }))
assert is_pattern(p, 'p0')
assert get_junction(p, 'j0')['pattern'] == 'p0'
assert get_reservoir(p, 'r0')['pattern'] == 'p0'
assert get_pump(p, 'pump0')['pattern'] == 'p0'
assert get_demand(p, 'j0')['demands'] == [{'demand': 10.0, 'pattern': 'p0', 'category': 'x'}, {'demand': 20.0, 'pattern': 'p0', 'category': None}]
@@ -1987,7 +1949,6 @@ class TestApi:
delete_pattern(p, ChangeSet({'id': 'p0'}))
assert is_pattern(p, 'p0') == False
assert get_junction(p, 'j0')['pattern'] == None
assert get_reservoir(p, 'r0')['pattern'] == None
assert get_pump(p, 'pump0')['pattern'] == None
assert get_demand(p, 'j0')['demands'] == [{'demand': 10.0, 'pattern': None, 'category': 'x'}, {'demand': 20.0, 'pattern': None, 'category': None}]
@@ -1996,7 +1957,6 @@ class TestApi:
execute_undo(p)
assert is_pattern(p, 'p0')
assert get_junction(p, 'j0')['pattern'] == 'p0'
assert get_reservoir(p, 'r0')['pattern'] == 'p0'
assert get_pump(p, 'pump0')['pattern'] == 'p0'
assert get_demand(p, 'j0')['demands'] == [{'demand': 10.0, 'pattern': 'p0', 'category': 'x'}, {'demand': 20.0, 'pattern': 'p0', 'category': None}]
@@ -2005,7 +1965,6 @@ class TestApi:
execute_redo(p)
assert is_pattern(p, 'p0') == False
assert get_junction(p, 'j0')['pattern'] == None
assert get_reservoir(p, 'r0')['pattern'] == None
assert get_pump(p, 'pump0')['pattern'] == None
assert get_demand(p, 'j0')['demands'] == [{'demand': 10.0, 'pattern': None, 'category': 'x'}, {'demand': 20.0, 'pattern': None, 'category': None}]