Refine energy api

2022-11-14 20:38:05 +08:00
parent 2e15bdce4b
commit 45c69033a8
4 changed files with 128 additions and 170 deletions
--- a/test_tjnetwork.py
+++ b/test_tjnetwork.py
@@ -1921,173 +1921,113 @@ class TestApi:
    # 15 energy


-    def test_global_energy(self):
-        p = 'test_global_energy'
+    def test_energy(self):
+        p = 'test_energy'
        self.enter(p)

-        ge = get_global_energy(p)
-        assert ge['price'] == 0.0
-        assert ge['pattern'] == None
-        assert ge['effic'] == float(75)
-        assert ge['demand_charge'] == 0.0
+        ge = get_energy(p)
+        assert ge['GLOBAL PRICE'] == '0'
+        assert ge['GLOBAL PATTERN'] == ''
+        assert ge['GLOBAL EFFIC'] == '75'
+        assert ge['DEMAND CHARGE'] == '0'

-        set_global_energy(p, ChangeSet({ 'price' : 10.0 }))
-        ge = get_global_energy(p)
-        assert ge['price'] == 10.0
-        assert ge['pattern'] == None
-        assert ge['effic'] == float(75)
-        assert ge['demand_charge'] == 0.0
+        set_energy(p, ChangeSet({ 'GLOBAL PRICE' : '10' }))
+        ge = get_energy(p)
+        assert ge['GLOBAL PRICE'] == '10'
+        assert ge['GLOBAL PATTERN'] == ''
+        assert ge['GLOBAL EFFIC'] == '75'
+        assert ge['DEMAND CHARGE'] == '0'

        add_pattern(p, ChangeSet({'id' : 'p0', 'factors': [1.0, 2.0, 3.0]}))
-        set_global_energy(p, ChangeSet({ 'pattern' : 'p0' }))
-        ge = get_global_energy(p)
-        assert ge['price'] == 10.0
-        assert ge['pattern'] == 'p0'
-        assert ge['effic'] == float(75)
-        assert ge['demand_charge'] == 0.0
+        set_energy(p, ChangeSet({ 'GLOBAL PATTERN' : 'p0' }))
+        ge = get_energy(p)
+        assert ge['GLOBAL PRICE'] == '10'
+        assert ge['GLOBAL PATTERN'] == 'p0'
+        assert ge['GLOBAL EFFIC'] == '75'
+        assert ge['DEMAND CHARGE'] == '0'

-        set_global_energy(p, ChangeSet({ 'effic' : 0.0 }))
-        ge = get_global_energy(p)
-        assert ge['price'] == 10.0
-        assert ge['pattern'] == 'p0'
-        assert ge['effic'] == 0.0
-        assert ge['demand_charge'] == 0.0
+        set_energy(p, ChangeSet({ 'GLOBAL EFFIC' : '0' }))
+        ge = get_energy(p)
+        assert ge['GLOBAL PRICE'] == '10'
+        assert ge['GLOBAL PATTERN'] == 'p0'
+        assert ge['GLOBAL EFFIC'] == '0'
+        assert ge['DEMAND CHARGE'] == '0'

-        set_global_energy(p, ChangeSet({ 'demand_charge' : 10.0 }))
-        ge = get_global_energy(p)
-        assert ge['price'] == 10.0
-        assert ge['pattern'] == 'p0'
-        assert ge['effic'] == 0.0
-        assert ge['demand_charge'] == 10.0
+        set_energy(p, ChangeSet({ 'DEMAND CHARGE' : '10' }))
+        ge = get_energy(p)
+        assert ge['GLOBAL PRICE'] == '10'
+        assert ge['GLOBAL PATTERN'] == 'p0'
+        assert ge['GLOBAL EFFIC'] == '0'
+        assert ge['DEMAND CHARGE'] == '10'

        self.leave(p)


-    def test_global_energy_op(self):
-        p = 'test_global_energy_op'
+    def test_energy_op(self):
+        p = 'test_energy_op'
        self.enter(p)

        add_pattern(p, ChangeSet({'id' : 'p0', 'factors': [1.0, 2.0, 3.0]}))

-        cs = set_global_energy(p, ChangeSet({ 'price' : 10.0 })).operations[0]
+        cs = set_energy(p, ChangeSet({ 'GLOBAL PRICE' : '10' })).operations[0]
        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 10.0
-        assert cs['pattern'] == None
-        assert cs['effic'] == float(75)
-        assert cs['demand_charge'] == 0.0
+        assert cs['type'] == 'energy'
+        assert cs['GLOBAL PRICE'] == '10'

        cs = execute_undo(p).operations[0]
        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 0.0
-        assert cs['pattern'] == None
-        assert cs['effic'] == float(75)
-        assert cs['demand_charge'] == 0.0
+        assert cs['type'] == 'energy'
+        assert cs['GLOBAL PRICE'] == '0'

        cs = execute_redo(p).operations[0]
        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 10.0
-        assert cs['pattern'] == None
-        assert cs['effic'] == float(75)
-        assert cs['demand_charge'] == 0.0
+        assert cs['type'] == 'energy'
+        assert cs['GLOBAL PRICE'] == '10'

-        cs = set_global_energy(p, ChangeSet({ 'pattern' : 'p0' })).operations[0]
+        cs = set_energy(p, ChangeSet({ 'GLOBAL PATTERN' : 'p0' })).operations[0]
        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 10.0
-        assert cs['pattern'] == 'p0'
-        assert cs['effic'] == float(75)
-        assert cs['demand_charge'] == 0.0
+        assert cs['type'] == 'energy'
+        assert cs['GLOBAL PATTERN'] == 'p0'

        cs = execute_undo(p).operations[0]
        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 10.0
-        assert cs['pattern'] == None
-        assert cs['effic'] == float(75)
-        assert cs['demand_charge'] == 0.0
+        assert cs['type'] == 'energy'
+        assert cs['GLOBAL PATTERN'] == ''

        cs = execute_redo(p).operations[0]
        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 10.0
-        assert cs['pattern'] == 'p0'
-        assert cs['effic'] == float(75)
-        assert cs['demand_charge'] == 0.0
+        assert cs['type'] == 'energy'
+        assert cs['GLOBAL PATTERN'] == 'p0'

-        cs = set_global_energy(p, ChangeSet({ 'effic' : 0.0 })).operations[0]
+        cs = set_energy(p, ChangeSet({ 'GLOBAL EFFIC' : '0' })).operations[0]
        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 10.0
-        assert cs['pattern'] == 'p0'
-        assert cs['effic'] == 0.0
-        assert cs['demand_charge'] == 0.0
+        assert cs['type'] == 'energy'
+        assert cs['GLOBAL EFFIC'] == '0'

        cs = execute_undo(p).operations[0]
        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 10.0
-        assert cs['pattern'] == 'p0'
-        assert cs['effic'] == float(75)
-        assert cs['demand_charge'] == 0.0
+        assert cs['type'] == 'energy'
+        assert cs['GLOBAL EFFIC'] == '75'

        cs = execute_redo(p).operations[0]
        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 10.0
-        assert cs['pattern'] == 'p0'
-        assert cs['effic'] == 0.0
-        assert cs['demand_charge'] == 0.0
+        assert cs['type'] == 'energy'
+        assert cs['GLOBAL EFFIC'] == '0'

-        cs = set_global_energy(p, ChangeSet({ 'demand_charge' : 10.0 })).operations[0]
+        cs = set_energy(p, ChangeSet({ 'DEMAND CHARGE' : '10' })).operations[0]
        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 10.0
-        assert cs['pattern'] == 'p0'
-        assert cs['effic'] == 0.0
-        assert cs['demand_charge'] == 10.0
+        assert cs['type'] == 'energy'
+        assert cs['DEMAND CHARGE'] == '10'

        cs = execute_undo(p).operations[0]
        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 10.0
-        assert cs['pattern'] == 'p0'
-        assert cs['effic'] == 0.0
-        assert cs['demand_charge'] == 0.0
+        assert cs['type'] == 'energy'
+        assert cs['DEMAND CHARGE'] == '0'

        cs = execute_redo(p).operations[0]
        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 10.0
-        assert cs['pattern'] == 'p0'
-        assert cs['effic'] == 0.0
-        assert cs['demand_charge'] == 10.0
-
-        cs = set_global_energy(p, ChangeSet({ 'price' : 0.0, 'pattern' : None, 'effic' : float(75), 'demand_charge' : 0.0 })).operations[0]
-        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 0.0
-        assert cs['pattern'] == None
-        assert cs['effic'] == float(75)
-        assert cs['demand_charge'] == 0.0
-
-        cs = execute_undo(p).operations[0]
-        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 10.0
-        assert cs['pattern'] == 'p0'
-        assert cs['effic'] == 0.0
-        assert cs['demand_charge'] == 10.0
-
-        cs = execute_redo(p).operations[0]
-        assert cs['operation'] == API_UPDATE
-        assert cs['type'] == 'global_energy'
-        assert cs['price'] == 0.0
-        assert cs['pattern'] == None
-        assert cs['effic'] == float(75)
-        assert cs['demand_charge'] == 0.0
+        assert cs['type'] == 'energy'
+        assert cs['DEMAND CHARGE'] == '10'

        self.leave(p)