Skip to content

Commit 8594034

Browse files
committed
name to nickname as helper not class var
1 parent 22e5cc1 commit 8594034

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

pygridsim/core.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@ def __init__(self):
2323
num_pv (int): Number of PV systems in circuit so far.
2424
num_generators (int): Number generators in circuit so far.
2525
nickname_to_name (dict[str, str]): Map from nicknames to their internal names.
26-
name_to_nickname (dict[str, str]): Map from internal names to nicknames.
2726
"""
2827
self.num_loads = 0
2928
self.num_lines = 0
3029
self.num_transformers = 0
3130
self.num_pv = 0
3231
self.num_generators = 0
3332
self.nickname_to_name = {}
34-
self.name_to_nickname = {}
3533
altdss.ClearAll()
3634
altdss('new circuit.MyCircuit')
3735

@@ -78,7 +76,6 @@ def add_load_nodes(self,
7876
self._check_naming(names[i])
7977
internal_name = "load" + str(self.num_loads)
8078
self.nickname_to_name[names[i]] = internal_name
81-
self.name_to_nickname[internal_name] = names[i]
8279

8380
_make_load_node(params, load_type, self.num_loads)
8481
self.num_loads += 1
@@ -171,7 +168,6 @@ def add_generators(self,
171168
self._check_naming(names[i])
172169
internal_name = "generator" + str(self.num_generators)
173170
self.nickname_to_name[names[i]] = internal_name
174-
self.name_to_nickname[internal_name] = names[i]
175171

176172
generators.append(_make_generator(params, gen_type, count=self.num_generators))
177173
self.num_generators += 1
@@ -223,6 +219,9 @@ def solve(self):
223219
"""
224220
altdss.Solution.Solve()
225221

222+
def _get_name_to_nickname(self):
223+
return {v: k for k, v in self.nickname_to_name.items()}
224+
226225
def results(self, queries: list[str], export_path=""):
227226
"""Gets simulation results based on specified queries.
228227
@@ -241,7 +240,7 @@ def results(self, queries: list[str], export_path=""):
241240
"""
242241
results = {}
243242
for query in queries:
244-
results[query] = _query_solution(query, self.name_to_nickname)
243+
results[query] = _query_solution(query, self._get_name_to_nickname())
245244

246245
if (export_path):
247246
_export_results(results, export_path)

0 commit comments

Comments
 (0)