Add demand api and test

test_tjnetwork.py

@@ -1174,6 +1174,72 @@ class TestApi:
         self.leave(p)
 
 
+    def test_demand(self):
+        p = 'test_demand'
+        self.enter(p)
+
+        add_junction(p, ChangeSet({'id': 'j1', 'x': 0.0, 'y': 10.0, 'elevation': 20.0}))
+        assert is_junction(p, 'j1')
+
+        set_demand(p, ChangeSet({'junction': 'j1', 'demands': [{'demand': 10.0, 'pattern': None, 'category': 'x'},
+                                                               {'demand': 20.0, 'pattern': None, 'category': None}]}))
+        d = get_demand(p, 'j1')
+        assert d['junction'] == 'j1'
+        ds = d['demands']
+        assert len(ds) == 2
+        assert ds[0]['demand'] == 10.0
+        assert ds[0]['pattern'] == None
+        assert ds[0]['category'] == 'x'
+        assert ds[1]['demand'] == 20.0
+        assert ds[1]['pattern'] == None
+        assert ds[1]['category'] == None
+
+        self.leave(p)
+
+
+    def test_demand_op(self):
+        p = 'test_demand'
+        self.enter(p)
+
+        add_junction(p, ChangeSet({'id': 'j1', 'x': 0.0, 'y': 10.0, 'elevation': 20.0}))
+        assert is_junction(p, 'j1')
+
+        cs = set_demand(p, ChangeSet({'junction': 'j1', 'demands': [{'demand': 10.0, 'pattern': None, 'category': 'x'},
+                                                                    {'demand': 20.0, 'pattern': None, 'category': None}]})).operations[0]
+        assert cs['operation'] == API_UPDATE
+        assert cs['type'] == 'demand'
+        assert cs['junction'] == 'j1'
+        ds = cs['demands']
+        assert len(ds) == 2
+        assert ds[0]['demand'] == 10.0
+        assert ds[0]['pattern'] == None
+        assert ds[0]['category'] == 'x'
+        assert ds[1]['demand'] == 20.0
+        assert ds[1]['pattern'] == None
+        assert ds[1]['category'] == None
+
+        cs = execute_undo(p).operations[0]
+        assert cs['operation'] == API_UPDATE
+        assert cs['type'] == 'demand'
+        assert cs['junction'] == 'j1'
+        assert len(cs['demands']) == 0
+
+        cs = execute_redo(p).operations[0]
+        assert cs['operation'] == API_UPDATE
+        assert cs['type'] == 'demand'
+        assert cs['junction'] == 'j1'
+        ds = cs['demands']
+        assert len(ds) == 2
+        assert ds[0]['demand'] == 10.0
+        assert ds[0]['pattern'] == None
+        assert ds[0]['category'] == 'x'
+        assert ds[1]['demand'] == 20.0
+        assert ds[1]['pattern'] == None
+        assert ds[1]['category'] == None
+
+        self.leave(p)
+
+
     def test_snapshot(self):
         p = "test_snapshot"
         self.enter(p)