Skip to content

Commit f63c9c4

Browse files
committed
allow lower case/spaces, totalpower split vector
1 parent 4b80a84 commit f63c9c4

File tree

2 files changed

+20
-5
lines changed

2 files changed

+20
-5
lines changed

pygridsim/results.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,25 @@
88

99

1010
def _query_solution(query):
11-
match query:
12-
case "Voltages":
11+
query_fix = query.lower().replace(" ", "")
12+
match query_fix:
13+
case "voltages":
1314
bus_vmags = {}
1415
for bus_name, bus_vmag in zip(altdss.BusNames(), altdss.BusVMag()):
1516
bus_vmags[bus_name] = float(bus_vmag)
1617
return bus_vmags
17-
case "Losses":
18+
case "losses":
1819
vector_losses = altdss.Losses()
1920
losses = {}
2021
losses["Active Power Loss"] = vector_losses.real
2122
losses["Reactive Power Loss"] = vector_losses.imag
2223
return losses
23-
case "TotalPower":
24-
return altdss.TotalPower()
24+
case "totalpower":
25+
vector_power = altdss.TotalPower()
26+
power = {}
27+
power["Active Power"] = vector_power.real
28+
power["Reactive Power"] = vector_power.imag
29+
return power
2530
case _:
2631
return "Invalid"
2732

tests/test_circuit.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,16 @@ def test_011_configs(self):
162162
with self.assertRaises(Exception):
163163
circuit.update_source(source_type=SourceType.TURBINE)
164164

165+
def test_012_all_results(self):
166+
circuit = PyGridSim()
167+
circuit.update_source()
168+
circuit.add_load_nodes()
169+
circuit.add_generators(num=2, gen_type="small")
170+
circuit.add_lines([("source", "load0"), ("generator0", "load0")])
171+
circuit.solve()
172+
# Should be flexible with capitalization, spaces
173+
print(circuit.results(["Voltages", "losses", "Total Power"]))
174+
165175

166176
class TestCustomizedCircuit(unittest.TestCase):
167177
"""

0 commit comments

Comments
 (0)