Skip to content

Commit 771bcc3

Browse files
committed
add additional support of the individual loss components
1 parent f63c9c4 commit 771bcc3

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

pygridsim/results.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,32 @@
99

1010
def _query_solution(query):
1111
query_fix = query.lower().replace(" ", "")
12+
vector_losses = altdss.Losses()
13+
vector_power = altdss.TotalPower()
1214
match query_fix:
1315
case "voltages":
1416
bus_vmags = {}
1517
for bus_name, bus_vmag in zip(altdss.BusNames(), altdss.BusVMag()):
1618
bus_vmags[bus_name] = float(bus_vmag)
1719
return bus_vmags
1820
case "losses":
19-
vector_losses = altdss.Losses()
2021
losses = {}
2122
losses["Active Power Loss"] = vector_losses.real
2223
losses["Reactive Power Loss"] = vector_losses.imag
2324
return losses
2425
case "totalpower":
25-
vector_power = altdss.TotalPower()
2626
power = {}
2727
power["Active Power"] = vector_power.real
2828
power["Reactive Power"] = vector_power.imag
2929
return power
30+
case "activeloss" | "activepowerloss" | "realloss" | "realpowerloss":
31+
return vector_losses.real
32+
case "reactiveloss" | "reactivepowerloss":
33+
return vector_losses.imag
34+
case "activepower" | "realpower":
35+
return vector_power.real
36+
case "reactivepower":
37+
return vector_power.imag
3038
case _:
3139
return "Invalid"
3240

tests/test_circuit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ def test_012_all_results(self):
170170
circuit.add_lines([("source", "load0"), ("generator0", "load0")])
171171
circuit.solve()
172172
# Should be flexible with capitalization, spaces
173-
print(circuit.results(["Voltages", "losses", "Total Power"]))
173+
print(circuit.results(["Voltages", "losses", "Total Power", "realpowerloss", "Active Power"]))
174174

175175

176176
class TestCustomizedCircuit(unittest.TestCase):

0 commit comments

Comments
 (0)